QRcode support tab param

pull/274/head
FongMi 2 years ago
parent 2a2fb11d44
commit 1d0bc1ff62
  1. 29
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
  2. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java
  3. 5
      app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java
  4. 5
      app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java
  5. 5
      app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java
  6. 15
      app/src/main/assets/js/script.js
  7. 4
      app/src/main/java/com/fongmi/android/tv/server/Server.java

@ -2,6 +2,7 @@ package com.fongmi.android.tv.ui.activity;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.text.TextUtils;
import android.view.View;
@ -21,7 +22,17 @@ public class PushActivity extends BaseActivity {
private ActivityPushBinding mBinding;
public static void start(Activity activity) {
activity.startActivity(new Intent(activity, PushActivity.class));
start(activity, 2);
}
public static void start(Activity activity, int tab) {
Intent intent = new Intent(new Intent(activity, PushActivity.class));
intent.putExtra("tab", tab);
activity.startActivity(intent);
}
private int getTab() {
return getIntent().getIntExtra("tab", 2);
}
@Override
@ -31,9 +42,13 @@ public class PushActivity extends BaseActivity {
@Override
protected void initView() {
String address = Server.get().getAddress();
mBinding.code.setImageBitmap(QRCode.getBitmap(address, 250, 1));
mBinding.info.setText(ResUtil.getString(R.string.push_info, address));
mBinding.code.setImageBitmap(QRCode.getBitmap(Server.get().getAddress(getTab()), 250, 1));
mBinding.info.setText(ResUtil.getString(R.string.push_info, Server.get().getAddress()));
}
@Override
protected void initEvent() {
mBinding.code.setOnClickListener(this::onCode);
mBinding.clip.setOnClickListener(this::onClip);
}
@ -41,4 +56,10 @@ public class PushActivity extends BaseActivity {
CharSequence text = Util.getClipText();
if (!TextUtils.isEmpty(text)) VideoActivity.start(this, Sniffer.getUrl(text.toString()), false);
}
private void onCode(View view) {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(Server.get().getAddress(getTab())));
startActivity(intent);
}
}

@ -157,7 +157,7 @@ public class SearchActivity extends BaseActivity implements WordAdapter.OnClickL
@Override
public void onRemote() {
PushActivity.start(this);
PushActivity.start(this, 1);
}
@Override

@ -79,12 +79,11 @@ public class ConfigDialog implements DialogInterface.OnDismissListener {
}
private void initView() {
String address = Server.get().getAddress();
binding.text.setText(url = getUrl());
binding.code.setImageBitmap(QRCode.getBitmap(address, 200, 0));
binding.text.setSelection(TextUtils.isEmpty(url) ? 0 : url.length());
binding.positive.setText(edit ? R.string.dialog_edit : R.string.dialog_positive);
binding.info.setText(ResUtil.getString(R.string.push_info, address).replace(",", "\n"));
binding.code.setImageBitmap(QRCode.getBitmap(Server.get().getAddress(3), 200, 0));
binding.info.setText(ResUtil.getString(R.string.push_info, Server.get().getAddress()).replace(",", "\n"));
binding.storage.setVisibility(PermissionX.isGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) ? View.GONE : View.VISIBLE);
}

@ -60,11 +60,10 @@ public class ProxyDialog implements DialogInterface.OnDismissListener {
private void initView() {
String text = Setting.getProxy();
String address = Server.get().getAddress();
binding.text.setText(text);
binding.code.setImageBitmap(QRCode.getBitmap(address, 200, 0));
binding.text.setSelection(TextUtils.isEmpty(text) ? 0 : text.length());
binding.info.setText(ResUtil.getString(R.string.push_info, address).replace(",", "\n"));
binding.code.setImageBitmap(QRCode.getBitmap(Server.get().getAddress(3), 200, 0));
binding.info.setText(ResUtil.getString(R.string.push_info, Server.get().getAddress()).replace(",", "\n"));
}
private void initEvent() {

@ -61,11 +61,10 @@ public class UaDialog implements DialogInterface.OnDismissListener {
private void initView() {
String text = Setting.getUa();
String address = Server.get().getAddress();
binding.text.setText(text);
binding.code.setImageBitmap(QRCode.getBitmap(address, 200, 0));
binding.text.setSelection(TextUtils.isEmpty(text) ? 0 : text.length());
binding.info.setText(ResUtil.getString(R.string.push_info, address).replace(",", "\n"));
binding.code.setImageBitmap(QRCode.getBitmap(Server.get().getAddress(3), 200, 0));
binding.info.setText(ResUtil.getString(R.string.push_info, Server.get().getAddress()).replace(",", "\n"));
}
private void initEvent() {

@ -234,4 +234,17 @@ $(function () {
$('.weui-tabbar__item').on('click', function () {
showPanel(parseInt($(this).attr('id').substr(3)));
});
});
});
$(document).ready(function () {
var url = window.location.search;
if (url.indexOf('tab=2') > 0) {
showPanel(2);
} else if (url.indexOf('tab=3') > 0) {
showPanel(3);
} else if (url.indexOf('tab=4') > 0) {
showPanel(4);
} else {
showPanel(1);
}
});

@ -28,6 +28,10 @@ public class Server {
return getAddress(false);
}
public String getAddress(int tab) {
return getAddress(false) + "?tab=" + tab;
}
public String getAddress(String path) {
return getAddress(true) + "/" + path;
}

Loading…
Cancel
Save