From b904574ef8d1b4ffc7a59fce8563cf7c2d855b7a Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 17 Jan 2024 08:32:19 +0800 Subject: [PATCH] Revert "update" This reverts commit 7598290fa7c60b0380bc709c85dfa60a4a64518d. --- .../fongmi/android/tv/ui/activity/VideoActivity.java | 1 - .../java/com/fongmi/android/tv/player/Players.java | 11 +---------- .../fongmi/android/tv/ui/activity/VideoActivity.java | 1 - 3 files changed, 1 insertion(+), 12 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 bf17ef021..1db9e7083 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 @@ -1435,7 +1435,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setFullscreen(boolean fullscreen) { this.fullscreen = fullscreen; - mPlayers.setFullscreen(fullscreen); } private boolean isInitTrack() { 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 003de9330..ce4634e3c 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 @@ -83,7 +83,6 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic private int decode; private int player; private long lastDanmuUpdate; - private boolean fullscreen; public static boolean isExo(int type) { return type == EXO; @@ -149,14 +148,6 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic danmuView = view; } - public void setFullscreen(boolean fullscreen) { - this.fullscreen = fullscreen; - } - - public boolean getFullscreen() { - return fullscreen; - } - public void setSub(Sub sub) { this.sub = sub; if (isIjk()) return; @@ -681,7 +672,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic @Override public void updateTimer(DanmakuTimer timer) { long timestamp = System.currentTimeMillis(); - if (lastDanmuUpdate <= 0 || (getFullscreen() && (timestamp - lastDanmuUpdate) > 300)) { + if (lastDanmuUpdate <= 0 || (timestamp - lastDanmuUpdate) > 300) { App.post(() -> timer.update(getPosition())); lastDanmuUpdate = timestamp; } 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 3d03f6b9d..948d4729a 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 @@ -1433,7 +1433,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setFullscreen(boolean fullscreen) { Util.toggleFullscreen(this, this.fullscreen = fullscreen); - mPlayers.setFullscreen(fullscreen); } private boolean isInitTrack() {