From a513b0e60f447e1d1e2a545a037957f8d14d7431 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 5 Jun 2024 23:09:18 +0800 Subject: [PATCH] Fix live bug --- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 6 +----- .../main/java/com/fongmi/android/tv/player/Players.java | 8 ++++---- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 6 +----- 3 files changed, 6 insertions(+), 14 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 63f2e1f12..934bd418b 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 @@ -684,7 +684,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick setMetadata(); hideProgress(); mPlayers.reset(); - setSpeedVisible(); setTrackVisible(true); mBinding.widget.size.setText(mPlayers.getSizeText()); break; @@ -694,12 +693,9 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } } - private void setSpeedVisible() { - mBinding.control.speed.setVisibility(mPlayers.isLive() ? View.GONE : View.VISIBLE); - } - private void setTrackVisible(boolean visible) { mBinding.control.text.setVisibility(visible ? View.VISIBLE : View.GONE); + mBinding.control.speed.setVisibility(visible && mPlayers.isVod() ? View.VISIBLE : View.GONE); mBinding.control.audio.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_AUDIO) ? View.VISIBLE : View.GONE); mBinding.control.video.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_VIDEO) ? View.VISIBLE : View.GONE); } 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 b0d340695..84b55c40e 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 @@ -209,12 +209,12 @@ public class Players implements Player.Listener, AnalyticsListener, ParseCallbac return TextUtils.isEmpty(getUrl()); } - public boolean isVod() { - return player != null && !player.isCurrentMediaItemLive(); + public boolean isLive() { + return getDuration() < 5 * 60 * 1000; } - public boolean isLive() { - return player != null && player.isCurrentMediaItemLive(); + public boolean isVod() { + return getDuration() > 5 * 60 * 1000; } public boolean isPortrait() { 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 6e3efd9f2..bd3a9071b 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 @@ -742,7 +742,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List setMetadata(); hideProgress(); mPlayers.reset(); - setSpeedVisible(); setTrackVisible(true); checkPlayImg(mPlayers.isPlaying()); mBinding.control.size.setText(mPlayers.getSizeText()); @@ -754,12 +753,9 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } } - private void setSpeedVisible() { - mBinding.control.action.speed.setVisibility(mPlayers.isLive() ? View.GONE : View.VISIBLE); - } - private void setTrackVisible(boolean visible) { mBinding.control.action.text.setVisibility(visible ? View.VISIBLE : View.GONE); + mBinding.control.action.speed.setVisibility(visible && mPlayers.isVod() ? View.VISIBLE : View.GONE); mBinding.control.action.audio.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_AUDIO) ? View.VISIBLE : View.GONE); mBinding.control.action.video.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_VIDEO) ? View.VISIBLE : View.GONE); }