From b616bc2b8165f49a60d2f4b061d5d9abce63bff6 Mon Sep 17 00:00:00 2001 From: YangJH Date: Wed, 24 Jan 2024 02:14:26 +0900 Subject: [PATCH 1/3] fix: check disableFocus when state is ready --- .../java/com/brentvatne/exoplayer/ReactExoplayerView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java index 5afd4f07d5..c49cd8ffc1 100644 --- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java +++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java @@ -1117,7 +1117,9 @@ public void onEvents(@NonNull Player player, Player.Events events) { if (playerControlView != null) { playerControlView.show(); } - setKeepScreenOn(preventsDisplaySleepDuringVideoPlayback); + if (!disableFocus) { + setKeepScreenOn(preventsDisplaySleepDuringVideoPlayback); + } break; case Player.STATE_ENDED: text += "ended"; From 60f38e04245e2249e670b27fc2b6a31815ff7f6a Mon Sep 17 00:00:00 2001 From: YangJH Date: Fri, 8 Mar 2024 23:32:31 +0900 Subject: [PATCH 2/3] Revert "fix: check disableFocus when state is ready" This reverts commit b616bc2b8165f49a60d2f4b061d5d9abce63bff6. --- .../java/com/brentvatne/exoplayer/ReactExoplayerView.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java index c49cd8ffc1..5afd4f07d5 100644 --- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java +++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java @@ -1117,9 +1117,7 @@ public void onEvents(@NonNull Player player, Player.Events events) { if (playerControlView != null) { playerControlView.show(); } - if (!disableFocus) { - setKeepScreenOn(preventsDisplaySleepDuringVideoPlayback); - } + setKeepScreenOn(preventsDisplaySleepDuringVideoPlayback); break; case Player.STATE_ENDED: text += "ended"; From 68052eabafaf809e5dff3acee933d60a0bf1bc79 Mon Sep 17 00:00:00 2001 From: YangJH Date: Fri, 8 Mar 2024 23:39:50 +0900 Subject: [PATCH 3/3] refactor: makes keepScreenOn ignore disableFocus when start playback --- .../java/com/brentvatne/exoplayer/ReactExoplayerView.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java index 5afd4f07d5..ef6398f162 100644 --- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java +++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java @@ -1008,9 +1008,7 @@ private void startPlayback() { } else { initializePlayer(); } - if (!disableFocus) { - setKeepScreenOn(preventsDisplaySleepDuringVideoPlayback); - } + setKeepScreenOn(preventsDisplaySleepDuringVideoPlayback); } private void pausePlayback() {