From 9d84ad46d52bbf49be820782204e474e2cdab280 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 19 Aug 2022 11:23:59 +0800 Subject: [PATCH] Add next check --- .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 2 +- app/src/main/java/com/fongmi/android/tv/player/Players.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 3a7f19a5c..d5d2dbdb8 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 @@ -428,7 +428,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener { mBinding.progress.getRoot().setVisibility(View.GONE); break; case Player.STATE_ENDED: - onNext(); + if (Players.get().canNext()) onNext(); break; default: if (!event.isRetry() || ++mRetry > 3) onError(event.getMsg()); diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index af9eb7e8a..42b92342e 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -106,6 +106,10 @@ public class Players implements Player.Listener, ParseTask.Callback { return exoPlayer.getPlaybackState() == Player.STATE_IDLE; } + public boolean canNext() { + return getCurrentPosition() >= getDuration(); + } + public void setMediaSource(Result result, boolean useParse) { if (result.getUrl().isEmpty()) { PlayerEvent.error(R.string.error_play_load);