fix: Fix an issue where the shortcut key failed after the switch window was pinned to the top

Author: Jankin-Wu

composeApp/src/commonMain/kotlin/com/jankinwu/fntv/client/data/network/impl/ReportingService.kt

@@ -96,7 +96,7 @@ class ReportingService(private val context: Context) {
                     contentType(ContentType.Application.Json)
                     setBody(sortedBody + ("signature" to signature))
                 }
-                logger.i("Reporting request body: $sortedBody, signature=$signature")
+                logger.i("Reporting request body: $sortedBody")
                 if (response.status.isSuccess()) {
                     settings[lastReportInfoKey] = currentReportInfo
                     logger.i { "Successfully reported launch for version $currentVersion on $today" }

composeApp/src/commonMain/kotlin/com/jankinwu/fntv/client/ui/screen/PlayerScreen.kt

@@ -192,6 +192,11 @@ data class PlayerState(
 
 class PlayerManager {
     var playerState: PlayerState by mutableStateOf(PlayerState())
+    var keyFocusRequestSerial: Int by mutableIntStateOf(0)
+
+    fun requestKeyFocus() {
+        keyFocusRequestSerial++
+    }
 
     fun showPlayer(
         itemGuid: String,
@@ -892,17 +897,30 @@ fun PlayerOverlay(
     var surfaceRecreateKey by remember { mutableIntStateOf(0) }
     var lastMinimized by remember { mutableStateOf(isMinimized) }
     var lastWindowFocused by remember { mutableStateOf(isWindowFocused) }
+    val focusRequester = remember { FocusRequester() }
+    val keyFocusRequestSerial = playerManager.keyFocusRequestSerial
 
     LaunchedEffect(isMinimized, isWindowFocused) {
         val restoredFromMinimize = lastMinimized && !isMinimized
         val regainedFocus = !lastWindowFocused && isWindowFocused
         if (restoredFromMinimize || regainedFocus) {
             surfaceRecreateKey++
+            if (isWindowFocused) {
+                focusRequester.requestFocus()
+                delay(50)
+                focusRequester.requestFocus()
+            }
         }
         lastMinimized = isMinimized
         lastWindowFocused = isWindowFocused
     }
 
+    LaunchedEffect(keyFocusRequestSerial) {
+        focusRequester.requestFocus()
+        delay(50)
+        focusRequester.requestFocus()
+    }
+
     // region Window Resize Logic
     var isProgrammaticResize by remember { mutableStateOf(true) }
 
@@ -998,10 +1016,10 @@ fun PlayerOverlay(
             }
     }
     // endregion
-
-    val focusRequester = remember { FocusRequester() }
-    LaunchedEffect(Unit, windowState.placement) {
-        focusRequester.requestFocus()
+    LaunchedEffect(windowState.placement, isWindowFocused) {
+        if (isWindowFocused) {
+            focusRequester.requestFocus()
+        }
     }
 
     CompositionLocalProvider(

composeApp/src/jvmMain/kotlin/com/jankinwu/fntv/client/window/WindowFrame.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.window.FrameWindowScope
 import androidx.compose.ui.window.WindowState
 import com.jankinwu.fntv.client.AppTheme
 import com.jankinwu.fntv.client.RefreshManager
+import com.jankinwu.fntv.client.ui.providable.LocalPlayerManager
 import com.jankinwu.fntv.client.ui.providable.LocalStore
 import io.github.composefluent.component.NavigationDisplayMode
 import io.github.composefluent.gallery.jna.windows.structure.isWindows10OrLater
@@ -37,15 +38,18 @@ fun FrameWindowScope.WindowFrame(
     var isRefreshing by remember { mutableStateOf(false) }
     var isAlwaysOnTop by remember { mutableStateOf(false) }
 
-     LaunchedEffect(isAlwaysOnTop) {
+    LaunchedEffect(isAlwaysOnTop) {
         window.isAlwaysOnTop = isAlwaysOnTop
+        window.requestFocus()
+        window.rootPane.requestFocusInWindow()
     }
 
     AppTheme(
         !supportBackdrop,
         state,
         refreshManager
     ) {
+        val playerManager = LocalPlayerManager.current
         val isCollapsed = LocalStore.current.navigationDisplayMode == NavigationDisplayMode.LeftCollapsed
         when {
             hostOs.isWindows && isWindows10OrLater() -> {
@@ -60,7 +64,12 @@ fun FrameWindowScope.WindowFrame(
                     backButtonEnabled = backButtonEnabled,
                     backButtonClick = backButtonClick,
                     isAlwaysOnTop = isAlwaysOnTop,
-                    onToggleAlwaysOnTop = { isAlwaysOnTop = !isAlwaysOnTop },
+                    onToggleAlwaysOnTop = {
+                        isAlwaysOnTop = !isAlwaysOnTop
+                        if (playerManager.playerState.isVisible) {
+                            playerManager.requestKeyFocus()
+                        }
+                    },
                     onRefreshClick = {
                         // 执行刷新操作
                         refreshManager.requestRefresh {
@@ -89,7 +98,12 @@ fun FrameWindowScope.WindowFrame(
                     title = if (isCollapsed) "" else title,
                     state = state,
                     isAlwaysOnTop = isAlwaysOnTop,
-                    onToggleAlwaysOnTop = { isAlwaysOnTop = !isAlwaysOnTop },
+                    onToggleAlwaysOnTop = {
+                        isAlwaysOnTop = !isAlwaysOnTop
+                        if (playerManager.playerState.isVisible) {
+                            playerManager.requestKeyFocus()
+                        }
+                    },
                     onRefreshClick = {
                         // 执行刷新操作
                         refreshManager.requestRefresh {
@@ -105,4 +119,4 @@ fun FrameWindowScope.WindowFrame(
             }
         }
     }
-}
+}