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 93e170208..78401fe21 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 @@ -175,6 +175,10 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic this.url = null; } + public boolean isEmpty() { + return TextUtils.isEmpty(getUrl()); + } + public MediaSessionCompat getSession() { return session; } 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 db16cb4b7..f43044f61 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 @@ -459,8 +459,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void showControl() { - mBinding.control.info.setVisibility(mPlayers.getUrl() == null ? View.GONE : View.VISIBLE); - mBinding.control.cast.setVisibility(mPlayers.getUrl() == null ? View.GONE : View.VISIBLE); + mBinding.control.info.setVisibility(mPlayers.isEmpty() ? View.GONE : View.VISIBLE); + mBinding.control.cast.setVisibility(mPlayers.isEmpty() ? View.GONE : View.VISIBLE); mBinding.control.right.rotate.setVisibility(isLock() ? View.GONE : View.VISIBLE); mBinding.control.right.back.setVisibility(isLock() ? View.GONE : View.VISIBLE); mBinding.control.bottom.setVisibility(isLock() ? View.GONE : View.VISIBLE); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index fb6aa89ea..fede96a3b 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -731,6 +731,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void checkPlay() { setR1Callback(); if (mPlayers.isPlaying()) onPaused(); + else if (mPlayers.isEmpty()) onRefresh(); else onPlay(); } @@ -981,9 +982,9 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo mBinding.control.right.back.setVisibility(isFullscreen() && !isLock() ? View.VISIBLE : View.GONE); mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE); mBinding.control.action.getRoot().setVisibility(isFullscreen() ? View.VISIBLE : View.GONE); - mBinding.control.info.setVisibility(mPlayers.getUrl() == null ? View.GONE : View.VISIBLE); - mBinding.control.cast.setVisibility(mPlayers.getUrl() == null ? View.GONE : View.VISIBLE); mBinding.control.right.lock.setVisibility(isFullscreen() ? View.VISIBLE : View.GONE); + mBinding.control.info.setVisibility(mPlayers.isEmpty() ? View.GONE : View.VISIBLE); + mBinding.control.cast.setVisibility(mPlayers.isEmpty() ? View.GONE : View.VISIBLE); mBinding.control.center.setVisibility(isLock() ? View.GONE : View.VISIBLE); mBinding.control.bottom.setVisibility(isLock() ? View.GONE : View.VISIBLE); mBinding.control.top.setVisibility(isLock() ? View.GONE : View.VISIBLE);