From 53b1ab99e03f327509434ecbffe616acdb8bae8f Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Tue, 2 Dec 2025 13:29:21 +0800 Subject: [PATCH] Optimize live end check --- .../fongmi/android/tv/ui/activity/LiveActivity.java | 10 +++++++++- .../fongmi/android/tv/ui/activity/LiveActivity.java | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) 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 961b2d771..9dfa7b06f 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 @@ -787,7 +787,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mPlayers.reset(); break; case Player.STATE_ENDED: - checkNext(); + checkEnded(); break; case PlayerEvent.TRACK: setMetadata(); @@ -799,6 +799,14 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } } + private void checkEnded() { + if (mPlayers.isLive()) { + checkNext(); + } else { + nextChannel(); + } + } + private void setTrackVisible() { mBinding.control.text.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_TEXT) || mPlayers.isVod() ? View.VISIBLE : View.GONE); mBinding.control.audio.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_AUDIO) ? View.VISIBLE : View.GONE); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 6ea2137cd..6bb48fc48 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -828,7 +828,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener mPlayers.reset(); break; case Player.STATE_ENDED: - checkNext(); + checkEnded(); break; case PlayerEvent.TRACK: setMetadata(); @@ -837,6 +837,14 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener } } + private void checkEnded() { + if (mPlayers.isLive()) { + checkNext(); + } else { + nextChannel(); + } + } + private void setTrackVisible() { mBinding.control.action.text.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_TEXT) || mPlayers.isVod() ? View.VISIBLE : View.GONE); mBinding.control.action.audio.setVisibility(mPlayers.haveTrack(C.TRACK_TYPE_AUDIO) ? View.VISIBLE : View.GONE);