perf: a11y status

Author: lisonge

app/src/main/kotlin/li/songe/gkd/MainActivity.kt

@@ -254,17 +254,23 @@ val accessRestrictedSettingsShowFlow = MutableStateFlow(false)
 
 @Composable
 fun AccessRestrictedSettingsDlg() {
+    val a11yRunning by A11yService.isRunning.collectAsState()
+    LaunchedEffect(a11yRunning) {
+        if (a11yRunning) {
+            accessRestrictedSettingsShowFlow.value = false
+        }
+    }
     val accessRestrictedSettingsShow by accessRestrictedSettingsShowFlow.collectAsState()
     val navController = LocalNavController.current
     val currentDestination by navController.currentDestinationAsState()
     val isA11yPage = currentDestination?.route == AuthA11YPageDestination.route
     LaunchedEffect(isA11yPage, accessRestrictedSettingsShow) {
-        if (isA11yPage && accessRestrictedSettingsShow) {
+        if (isA11yPage && accessRestrictedSettingsShow && !a11yRunning) {
             toast("请重新授权以解除限制")
             accessRestrictedSettingsShowFlow.value = false
         }
     }
-    if (accessRestrictedSettingsShow && !isA11yPage) {
+    if (accessRestrictedSettingsShow && !isA11yPage && !a11yRunning) {
         AlertDialog(
             title = {
                 Text(text = "访问受限")

app/src/main/kotlin/li/songe/gkd/service/GkdTileService.kt

@@ -111,24 +111,16 @@ private val modifyA11yMutex by lazy { Mutex() }
 
 fun switchA11yService() = appScope.launchTry(Dispatchers.IO) {
     modifyA11yMutex.withLock {
-        if (!writeSecureSettingsState.updateAndGet()) {
-            toast("请先授予「写入安全设置权限」")
-            return@launchTry
-        }
-        val names = getServiceNames()
-        storeFlow.update { it.copy(enableService = !A11yService.isRunning.value) }
+        val newEnableService = !A11yService.isRunning.value
         if (A11yService.isRunning.value) {
-            names.remove(a11yClsName)
-            updateServiceNames(names)
-            delay(500)
-            // https://github.com/orgs/gkd-kit/discussions/799
-            if (A11yService.isRunning.value) {
-                toast("关闭无障碍失败")
-                accessRestrictedSettingsShowFlow.value = true
-                return@launchTry
-            }
+            A11yService.instance?.disableSelf()
             toast("关闭无障碍")
         } else {
+            if (!writeSecureSettingsState.updateAndGet()) {
+                toast("请先授予「写入安全设置权限」")
+                return@launchTry
+            }
+            val names = getServiceNames()
             enableA11yService()
             if (names.contains(a11yClsName)) { // 当前无障碍异常, 重启服务
                 names.remove(a11yClsName)
@@ -138,13 +130,15 @@ fun switchA11yService() = appScope.launchTry(Dispatchers.IO) {
             names.add(a11yClsName)
             updateServiceNames(names)
             delay(500)
+            // https://github.com/orgs/gkd-kit/discussions/799
             if (!A11yService.isRunning.value) {
                 toast("开启无障碍失败")
                 accessRestrictedSettingsShowFlow.value = true
                 return@launchTry
             }
             toast("开启无障碍")
         }
+        storeFlow.update { it.copy(enableService = newEnableService) }
     }
 }
 

app/src/main/kotlin/li/songe/gkd/ui/AuthA11yPage.kt

@@ -172,7 +172,7 @@ fun AuthA11yPage() {
                 Text(
                     modifier = Modifier.padding(cardHorizontalPadding, 0.dp),
                     style = MaterialTheme.typography.bodyMedium,
-                    text = "1. 授予「写入安全设置权限」\n2. 授权永久有效, 包含「无障碍权限」\n3. 应用重启后可自动打开无障碍服务\n4. 在通知栏快捷开关可快捷重启, 无感保活"
+                    text = "1. 授予「写入安全设置权限」\n2. 授权永久有效, 包含「无障碍权限」\n3. 应用可自行控制开关无障碍服务\n4. 在通知栏快捷开关可快捷重启, 无感保活"
                 )
                 if (!writeSecureSettings) {
                     AuthButtonGroup()

app/src/main/kotlin/li/songe/gkd/ui/home/ControlPage.kt

@@ -28,7 +28,6 @@ import androidx.compose.material3.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@@ -107,43 +106,31 @@ fun useControlPage(): ScaffoldExt {
         val a11yServiceEnabled by a11yServiceEnabledFlow.collectAsState()
 
         // 无障碍故障: 设置中无障碍开启, 但是实际 service 没有运行
-        val a11yBroken = !writeSecureSettings && !a11yRunning && a11yServiceEnabled
+        val a11yBroken = !a11yRunning && a11yServiceEnabled
 
         Column(
             modifier = Modifier
                 .verticalScroll(scrollState)
                 .padding(contentPadding)
         ) {
-            if (writeSecureSettings) {
-                PageItemCard(
-                    imageVector = Icons.Default.Memory,
-                    title = "服务状态",
-                    subtitle = if (a11yRunning) "无障碍服务正在运行" else "无障碍服务已关闭",
-                    rightContent = {
-                        Switch(
-                            checked = a11yRunning,
-                            onCheckedChange = throttle<Boolean> {
+            PageItemCard(
+                imageVector = Icons.Default.Memory,
+                title = "服务状态",
+                subtitle = if (a11yRunning) "无障碍服务正在运行" else if (a11yBroken) "无障碍服务发生故障" else if (writeSecureSettings) "无障碍服务已关闭" else "无障碍服务未授权",
+                rightContent = {
+                    Switch(
+                        checked = a11yRunning,
+                        onCheckedChange = throttle(vm.viewModelScope.launchAsFn<Boolean> { newEnabled ->
+                            if (writeSecureSettings || !newEnabled) {
                                 switchA11yService()
-                            },
-                        )
-                    }
-                )
-            }
-            if (!writeSecureSettings && !a11yRunning) {
-                PageItemCard(
-                    imageVector = Icons.Default.Memory,
-                    title = "无障碍授权",
-                    subtitle = if (a11yBroken) "服务故障,请重新授权" else "授权使无障碍服务运行",
-                    rightContent = {
-                        OutlinedButton(onClick = throttle {
-                            navController.toDestinationsNavigator()
-                                .navigate(AuthA11YPageDestination)
-                        }) {
-                            Text(text = "授权")
-                        }
-                    }
-                )
-            }
+                            } else {
+                                navController.toDestinationsNavigator()
+                                    .navigate(AuthA11YPageDestination)
+                            }
+                        }),
+                    )
+                }
+            )
 
             PageItemCard(
                 imageVector = Icons.Outlined.Notifications,