From c0f20ab0364c9b70fcb31d74a8b9c337287dd873 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 20 Apr 2023 18:49:52 +0800 Subject: [PATCH] [leanback] clean code --- .../fongmi/android/tv/ui/activity/DetailActivity.java | 3 +-- .../fongmi/android/tv/ui/activity/LiveActivity.java | 11 +++++++---- .../android/tv/ui/custom/dialog/ConfigDialog.java | 2 +- .../android/tv/ui/custom/dialog/PassDialog.java | 9 +++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 98cf11ad5..732fe570d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -623,8 +623,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void onTrack(View view) { - int type = Integer.parseInt(view.getTag().toString()); - TrackDialog.create().player(mPlayers).type(type).listener(this).show(getSupportFragmentManager(), null); + TrackDialog.create().player(mPlayers).type(Integer.parseInt(view.getTag().toString())).show(this); hideControl(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index ac8665e1c..7ab5ee741 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -68,7 +68,7 @@ import okhttp3.Call; import okhttp3.Response; import tv.danmaku.ijk.media.player.ui.IjkVideoView; -public class LiveActivity extends BaseActivity implements GroupPresenter.OnClickListener, ChannelPresenter.OnClickListener, CustomKeyDownLive.Listener, CustomLiveListView.Callback, PassCallback, LiveCallback { +public class LiveActivity extends BaseActivity implements GroupPresenter.OnClickListener, ChannelPresenter.OnClickListener, CustomKeyDownLive.Listener, CustomLiveListView.Callback, TrackDialog.Listener, PassCallback, LiveCallback { private ActivityLiveBinding mBinding; private ArrayObjectAdapter mChannelAdapter; @@ -266,8 +266,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void onTrack(View view) { - int type = Integer.parseInt(view.getTag().toString()); - TrackDialog.create().player(mPlayers).type(type).show(getSupportFragmentManager(), null); + TrackDialog.create().player(mPlayers).type(Integer.parseInt(view.getTag().toString())).show(this); hideControl(); } @@ -418,8 +417,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mChannelAdapter.setItems(item.getChannel(), null); mBinding.channel.setSelectedPosition(item.getPosition()); if (!item.isKeep() || ++count < 5 || mHides.isEmpty()) return; + PassDialog.create().show(this); App.removeCallbacks(mR0); - PassDialog.show(this); resetPass(); } @@ -496,6 +495,10 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick showProgress(); } + @Override + public void onTrackClick(Track item) { + } + @Override public void setLive(Live item) { LiveConfig.get().setHome(item); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java index 42ec85eff..0b90be825 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java @@ -73,8 +73,8 @@ public class ConfigDialog implements DialogInterface.OnDismissListener { private void initView() { String address = Server.get().getAddress(); binding.text.setText(url = getUrl()); - binding.text.setSelection(TextUtils.isEmpty(url) ? 0 : url.length()); binding.code.setImageBitmap(QRCode.getBitmap(address, 200, 0)); + binding.text.setSelection(TextUtils.isEmpty(url) ? 0 : url.length()); binding.storage.setVisibility(Utils.hasPermission(activity) ? View.GONE : View.VISIBLE); binding.info.setText(ResUtil.getString(R.string.push_info, address).replace("，", "\n")); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java index bb3fe1ca7..a2752b5f3 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java @@ -23,12 +23,13 @@ public class PassDialog extends BaseDialog { private final PassCallback callback; private DialogPassBinding binding; - public static void show(FragmentActivity activity) { - for (Fragment fragment : activity.getSupportFragmentManager().getFragments()) if (fragment instanceof BottomSheetDialogFragment) return; - new PassDialog(activity).show(activity.getSupportFragmentManager(), null); + public static PassDialog create() { + return new PassDialog(); } - private PassDialog(FragmentActivity activity) { + public void show(FragmentActivity activity) { + for (Fragment f : activity.getSupportFragmentManager().getFragments()) if (f instanceof BottomSheetDialogFragment) return; + show(activity.getSupportFragmentManager(), null); this.callback = (PassCallback) activity; }