perf: activityOkFlow

Author: lisonge

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

@@ -20,7 +20,6 @@ import li.songe.gkd.util.OnA11yLife
 import li.songe.gkd.util.componentName
 import li.songe.selector.MatchOption
 import li.songe.selector.Selector
-import java.lang.ref.WeakReference
 
 abstract class A11yService : AccessibilityService(), OnA11yLife {
     override fun onCreate() = onCreated()
@@ -52,8 +51,8 @@ abstract class A11yService : AccessibilityService(), OnA11yLife {
     init {
         useLogLifecycle()
         useAliveFlow(isRunning)
-        onCreated { a11yWeakRef = WeakReference(this) }
-        onDestroyed { a11yWeakRef = null }
+        onCreated { a11yRef = this }
+        onDestroyed { a11yRef = null }
         A11yRuleEngine(this)
         onA11yFeatInit()
     }
@@ -63,9 +62,9 @@ abstract class A11yService : AccessibilityService(), OnA11yLife {
         val a11yClsName by lazy { a11yComponentName.flattenToShortString() }
 
         val isRunning = MutableStateFlow(false)
-        private var a11yWeakRef: WeakReference<A11yService>? = null
+        private var a11yRef: A11yService? = null
         val instance: A11yService?
-            get() = a11yWeakRef?.get()
+            get() = a11yRef
 
         fun execAction(gkdAction: GkdAction): ActionResult {
             val service = instance ?: throw RpcError("无障碍没有运行")

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

@@ -26,6 +26,8 @@ import li.songe.gkd.a11y.topActivityFlow
 import li.songe.gkd.notif.StopServiceReceiver
 import li.songe.gkd.notif.recordNotif
 import li.songe.gkd.permission.canDrawOverlaysState
+import li.songe.gkd.shizuku.SafeTaskListener
+import li.songe.gkd.shizuku.shizukuContextFlow
 import li.songe.gkd.ui.component.AppNameText
 import li.songe.gkd.ui.theme.AppTheme
 import li.songe.gkd.util.appInfoCacheFlow
@@ -34,13 +36,19 @@ import li.songe.gkd.util.stopServiceByClass
 
 
 class RecordService : OverlayWindowService() {
+    override val positionStoreKey = "overlay_xy_record"
+
     val topAppInfoFlow by lazy {
         appInfoCacheFlow.combine(topActivityFlow) { map, topActivity ->
             map[topActivity.appId]
         }.stateIn(lifecycleScope, SharingStarted.Eagerly, null)
     }
 
-    override val positionStoreKey = "overlay_xy_record"
+    val activityOkFlow by lazy {
+        combine(A11yService.isRunning, shizukuContextFlow) { a, b ->
+            a || (b.activityTaskManager != null && SafeTaskListener.isAvailable)
+        }.stateIn(scope = lifecycleScope, started = SharingStarted.Eagerly, initialValue = false)
+    }
 
     @Composable
     override fun ComposeContent() = AppTheme(invertedTheme = true) {
@@ -52,7 +60,7 @@ class RecordService : OverlayWindowService() {
                 .padding(horizontal = 4.dp, vertical = 2.dp)
         ) {
             CompositionLocalProvider(LocalContentColor provides contentColorFor(bgColor)) {
-                if (A11yService.isRunning.collectAsState().value) {
+                if (activityOkFlow.collectAsState().value) {
                     val topActivity = topActivityFlow.collectAsState().value
                     Text(
                         text = topActivity.number.toString(),
@@ -73,7 +81,7 @@ class RecordService : OverlayWindowService() {
                 } else {
                     Column {
                         Text(text = "记录服务")
-                        Text(text = "无障碍服务未运行")
+                        Text(text = "无权限检测界面切换")
                     }
                 }
             }

app/src/main/kotlin/li/songe/gkd/shizuku/ShizukuApi.kt

@@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import li.songe.gkd.META
 import li.songe.gkd.app
 import li.songe.gkd.appScope
 import li.songe.gkd.data.AppInfo
@@ -145,8 +144,10 @@ private fun updateShizukuBinder() = appScope.launchTry(Dispatchers.IO) {
                 serviceWrapper?.destroy()
                 activityTaskManager?.unregisterDefault()
             }
-            val prefix = if (isActivityVisible()) "" else "${META.appName}: "
-            toast("${prefix}Shizuku 服务已断开")
+            shizukuContextFlow.value = defaultShizukuContext
+            if (isActivityVisible()) {
+                toast("Shizuku 服务已断开")
+            }
         }
     }
 }