From d3cd2c97fe2511c0b1cc039797abe4721d886fd1 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 13 Apr 2023 23:29:57 +0800 Subject: [PATCH] Don't seamless if not changeable --- .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java | 2 ++ .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java | 2 ++ 2 files changed, 4 insertions(+) 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 2ade0ecae..224d050f6 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 @@ -416,6 +416,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void seamless(Vod.Flag flag) { + if (!getSite().isChangeable()) return; Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks()); if (episode == null || episode.isActivated()) return; mHistory.setVodRemarks(episode.getName()); @@ -716,6 +717,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mHistory = History.find(getHistoryKey()); mHistory = mHistory == null ? createHistory(item) : mHistory; setFlagActivated(mHistory.getFlag()); + setEpisodeActivated(mHistory.getEpisode()); if (mHistory.isRevSort()) reverseEpisode(true); mBinding.control.opening.setText(mHistory.getOpening() == 0 ? getString(R.string.play_op) : mPlayers.stringToTime(mHistory.getOpening())); mBinding.control.ending.setText(mHistory.getEnding() == 0 ? getString(R.string.play_ed) : mPlayers.stringToTime(mHistory.getEnding())); 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 4e67814f0..0bbf647d6 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 @@ -421,6 +421,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void seamless(Vod.Flag flag) { + if (!getSite().isChangeable()) return; Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks()); if (episode == null || episode.isActivated()) return; mHistory.setVodRemarks(episode.getName()); @@ -739,6 +740,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mHistory = History.find(getHistoryKey()); mHistory = mHistory == null ? createHistory(item) : mHistory; onItemClick(mHistory.getFlag()); + onItemClick(mHistory.getEpisode()); if (mHistory.isRevSort()) reverseEpisode(true); mBinding.control.action.opening.setText(mHistory.getOpening() == 0 ? getString(R.string.play_op) : mPlayers.stringToTime(mHistory.getOpening())); mBinding.control.action.ending.setText(mHistory.getEnding() == 0 ? getString(R.string.play_ed) : mPlayers.stringToTime(mHistory.getEnding()));