From 6cf5d798d46e3f2e2183ebec9858e53f833734dc Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 7 Jun 2024 11:09:28 +0800 Subject: [PATCH] Fix live bug --- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 6 +----- app/src/main/java/com/fongmi/android/tv/player/Players.java | 4 ++++ .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 6 +----- 3 files changed, 6 insertions(+), 10 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 5c3921f9f..6cdd828b8 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 @@ -756,7 +756,6 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP setMetadata(); hideProgress(); mPlayers.reset(); - setSpeedVisible(); setTrackVisible(true); mBinding.widget.size.setText(mPlayers.getSizeText()); break; @@ -766,12 +765,9 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP } } - private void setSpeedVisible() { - mBinding.control.speed.setVisibility(mPlayers.isVod() ? View.VISIBLE : View.GONE); - } - private void setTrackVisible(boolean visible) { mBinding.control.text.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_TEXT) ? 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 0af633706..ce3ef9a55 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 @@ -287,6 +287,10 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic return TextUtils.isEmpty(getUrl()); } + public boolean isLive() { + return getDuration() < 5 * 60 * 1000; + } + public boolean isVod() { return getDuration() > 5 * 60 * 1000; } 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 9bc2f5be3..92a696a08 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 @@ -819,7 +819,6 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom resetToggle(); hideProgress(); mPlayers.reset(); - setSpeedVisible(); setTrackVisible(true); checkPlayImg(mPlayers.isPlaying()); mBinding.control.size.setText(mPlayers.getSizeText()); @@ -831,12 +830,9 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom } } - private void setSpeedVisible() { - mBinding.control.action.speed.setVisibility(mPlayers.isVod() ? View.VISIBLE : View.GONE); - } - private void setTrackVisible(boolean visible) { mBinding.control.action.text.setVisibility(visible && mPlayers.haveTrack(C.TRACK_TYPE_TEXT) ? 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); }