From 25120092d9c042b93c6569c8b320904d51d3fbbb Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 6 Oct 2023 15:22:52 +0800 Subject: [PATCH] Adjust full screen rule --- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 3 +-- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 5f4d069da..037050e9d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -543,7 +543,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List episode.setActivated(true); mBinding.episode.requestFocus(); mBinding.episode.setSelectedPosition(getEpisodePosition()); - episode.setActivated(false); } else { mHistory.setVodRemarks(episode.getName()); setEpisodeActivated(episode); @@ -617,7 +616,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private boolean shouldEnterFullscreen(Episode item) { - boolean enter = !isFullscreen() && item.isActivated(); + boolean enter = !isFullscreen() && item.isActivated() && mPlayers.isPlaying(); if (enter) enterFullscreen(); return enter; } 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 79700b30e..c0eaa8f60 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 @@ -595,7 +595,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo if (Setting.getFlag() == 1) { episode.setActivated(true); mBinding.episode.scrollToPosition(mEpisodeAdapter.getPosition()); - episode.setActivated(false); } else { mHistory.setVodRemarks(episode.getName()); onItemClick(episode); @@ -851,7 +850,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private boolean shouldEnterFullscreen(Episode item) { - boolean enter = !isFullscreen() && item.isActivated(); + boolean enter = !isFullscreen() && item.isActivated() && mPlayers.isPlaying(); if (enter) enterFullscreen(); return enter; }