Fix #958 安卓全屏后调节亮度无效

open-ani · Sep 25, 2024 · f98a5ba · f98a5ba
1 parent 10ea2e9
commit f98a5ba
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/app/shared/src/commonMain/kotlin/ui/subject/episode/EpisodePage.kt b/app/shared/src/commonMain/kotlin/ui/subject/episode/EpisodePage.kt
@@ -85,6 +85,8 @@ import me.him188.ani.app.data.source.danmaku.protocol.DanmakuInfo
 import me.him188.ani.app.data.source.danmaku.protocol.DanmakuLocation
 import me.him188.ani.app.navigation.LocalNavigator
 import me.him188.ani.app.platform.LocalContext
+import me.him188.ani.app.platform.features.StreamType
+import me.him188.ani.app.platform.features.getComponentAccessors
 import me.him188.ani.app.tools.rememberUiMonoTasker
 import me.him188.ani.app.ui.external.placeholder.placeholder
 import me.him188.ani.app.ui.foundation.ImageViewer
@@ -117,6 +119,8 @@ import me.him188.ani.app.ui.subject.episode.notif.VideoNotifEffect
 import me.him188.ani.app.ui.subject.episode.video.VideoDanmakuState
 import me.him188.ani.app.ui.subject.episode.video.topbar.EpisodePlayerTitle
 import me.him188.ani.app.videoplayer.ui.VideoControllerState
+import me.him188.ani.app.videoplayer.ui.guesture.NoOpLevelController
+import me.him188.ani.app.videoplayer.ui.guesture.asLevelController
 import me.him188.ani.app.videoplayer.ui.progress.PlayerControllerDefaults
 import me.him188.ani.app.videoplayer.ui.progress.PlayerControllerDefaults.randomDanmakuPlaceholder
 import me.him188.ani.app.videoplayer.ui.progress.rememberMediaProgressSliderState
@@ -587,6 +591,12 @@ private fun EpisodeVideo(
     )
     val scope = rememberCoroutineScope()
 
+    // 必须在 UI 里, 跟随 context 变化. 否则 #958
+    val platformComponents by remember {
+        derivedStateOf {
+            context.getComponentAccessors()
+        }
+    }
     EpisodeVideoImpl(
         vm.playerState,
         expanded = expanded,
@@ -658,8 +668,16 @@ private fun EpisodeVideo(
         mediaSourceResultsPresentation = vm.mediaSourceResultsPresentation,
         episodeSelectorState = vm.episodeSelectorState,
         mediaSourceInfoProvider = vm.mediaSourceInfoProvider,
-        audioController = vm.audioController,
-        brightnessController = vm.brightnessController,
+        audioController = remember {
+            derivedStateOf {
+                platformComponents.audioManager?.asLevelController(StreamType.MUSIC) ?: NoOpLevelController
+            }
+        }.value,
+        brightnessController = remember {
+            derivedStateOf {
+                platformComponents.brightnessManager?.asLevelController() ?: NoOpLevelController
+            }
+        }.value,
         leftBottomTips = {
             AnimatedVisibility(
                 visible = vm.playerSkipOpEdState.showSkipTips,

diff --git a/app/shared/src/commonMain/kotlin/ui/subject/episode/EpisodeViewModel.kt b/app/shared/src/commonMain/kotlin/ui/subject/episode/EpisodeViewModel.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright (C) 2024 OpenAni and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link.
+ *
+ * https://github.com/open-ani/ani/blob/main/LICENSE
+ */
+
 package me.him188.ani.app.ui.subject.episode
 
 import androidx.annotation.UiThread
@@ -58,9 +67,6 @@ import me.him188.ani.app.data.source.media.selector.autoSelect
 import me.him188.ani.app.data.source.media.selector.eventHandling
 import me.him188.ani.app.data.source.session.AuthState
 import me.him188.ani.app.platform.Context
-import me.him188.ani.app.platform.features.PlatformComponentAccessors
-import me.him188.ani.app.platform.features.StreamType
-import me.him188.ani.app.platform.features.getComponentAccessors
 import me.him188.ani.app.tools.caching.ContentPolicy
 import me.him188.ani.app.ui.comment.BangumiCommentSticker
 import me.him188.ani.app.ui.foundation.AbstractViewModel
@@ -94,9 +100,6 @@ import me.him188.ani.app.ui.subject.episode.video.VideoDanmakuStateImpl
 import me.him188.ani.app.ui.subject.episode.video.sidesheet.EpisodeSelectorState
 import me.him188.ani.app.videoplayer.ui.ControllerVisibility
 import me.him188.ani.app.videoplayer.ui.VideoControllerState
-import me.him188.ani.app.videoplayer.ui.guesture.LevelController
-import me.him188.ani.app.videoplayer.ui.guesture.NoOpLevelController
-import me.him188.ani.app.videoplayer.ui.guesture.asLevelController
 import me.him188.ani.app.videoplayer.ui.state.PlaybackState
 import me.him188.ani.app.videoplayer.ui.state.PlayerState
 import me.him188.ani.app.videoplayer.ui.state.PlayerStateFactory
@@ -173,10 +176,6 @@ abstract class EpisodeViewModel : AbstractViewModel(), HasBackgroundScope {
 
     abstract val mediaSourceInfoProvider: MediaSourceInfoProvider
 
-    abstract val audioController: LevelController
-    abstract val brightnessController: LevelController
-
-
     // Video
     abstract val videoControllerState: VideoControllerState
     abstract val videoScaffoldConfig: VideoScaffoldConfig
@@ -336,17 +335,6 @@ private class EpisodeViewModelImpl(
         getSourceInfoFlow = { mediaSourceManager.infoFlowByMediaSourceId(it) },
     )
 
-    private val platformComponentAccessors: PlatformComponentAccessors = context.getComponentAccessors()
-
-    override val audioController: LevelController by lazy {
-        platformComponentAccessors.audioManager?.asLevelController(
-            StreamType.MUSIC,
-        ) ?: NoOpLevelController
-    }
-    override val brightnessController: LevelController by lazy {
-        platformComponentAccessors.brightnessManager?.asLevelController() ?: NoOpLevelController
-    }
-
     override val mediaSelectorPresentation: MediaSelectorPresentation =
         MediaSelectorPresentation(mediaSelector, mediaSourceInfoProvider, backgroundScope.coroutineContext)