From 7367765e004bae1a4378eb1619ae6ed7c74d23af Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 1 Jul 2023 20:12:25 +0800 Subject: [PATCH] Adjust change rule --- .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 7 +++---- .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 7 +++---- 2 files changed, 6 insertions(+), 8 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 4065ed42a..8c9bd3461 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 @@ -540,9 +540,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void onChange() { - mBroken.add(getId()); - setAutoMode(true); - checkSearch(); + if (getSite().isChangeable()) checkSearch(); + else checkFlag(); } private void onLoop() { @@ -912,7 +911,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void onError(ErrorEvent event) { Clock.get().setCallback(null); showError(event.getMsg()); - mBroken.add(getId()); mPlayers.stop(); startFlow(); } @@ -1015,6 +1013,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis Vod vod = (Vod) mSearchAdapter.get(0); Notify.show(getString(R.string.play_switch_site, vod.getSiteName())); mSearchAdapter.removeItems(0, 1); + mBroken.add(getId()); setInitAuto(false); getDetail(vod); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 65c533f98..7f2b15719 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -503,9 +503,8 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust } private boolean onChange() { - mBroken.add(getId()); - setAutoMode(true); - checkSearch(); + if (getSite().isChangeable()) checkSearch(); + else checkFlag(); return true; } @@ -973,7 +972,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust mBinding.swipeLayout.setEnabled(true); Clock.get().setCallback(null); showError(event.getMsg()); - mBroken.add(getId()); mPlayers.stop(); startFlow(); } @@ -1076,6 +1074,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust Vod vod = mSearchAdapter.get(0); Notify.show(getString(R.string.play_switch_site, vod.getSiteName())); mSearchAdapter.remove(0); + mBroken.add(getId()); setInitAuto(false); getDetail(vod); }