fix: skipConsumeEvent (gkd-kit#824)

xanderwang · Dec 20, 2024 · 3ccb883 · 3ccb883
1 parent f167607
commit 3ccb883
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/data/ResolvedRule.kt b/app/src/main/kotlin/li/songe/gkd/data/ResolvedRule.kt
@@ -205,6 +205,9 @@ sealed class RuleStatus(val name: String) {
 
     val ok: Boolean
         get() = this === StatusOk
+
+    val alive: Boolean
+        get() = this !== Status1 && this !== Status2 && this !== Status4
 }
 
 fun getFixActivityIds(

diff --git a/app/src/main/kotlin/li/songe/gkd/service/A11yService.kt b/app/src/main/kotlin/li/songe/gkd/service/A11yService.kt
@@ -455,8 +455,8 @@ private fun A11yService.useMatchRule() {
             }
         }
         val activityRule = getAndUpdateCurrentRules()
-        if (evAppId != rightAppId || activityRule.skipMatch) {
-            // 放在 evAppId != rightAppId 的前面使得 TopActivity 能借助 lastTopActivity 恢复
+        // 放在 evAppId != rightAppId 的前面使得 TopActivity 能借助 lastTopActivity 恢复
+        if (evAppId != rightAppId || activityRule.skipConsumeEvent || !storeFlow.value.enableMatch) {
             return@launchEvent
         }
 

diff --git a/app/src/main/kotlin/li/songe/gkd/service/A11yState.kt b/app/src/main/kotlin/li/songe/gkd/service/A11yState.kt
@@ -97,7 +97,11 @@ class ActivityRule(
         }
     val skipMatch: Boolean
         get() {
-            return !currentRules.any { r -> r.status.ok } || !storeFlow.value.enableMatch
+            return currentRules.all { r -> !r.status.ok }
+        }
+    val skipConsumeEvent: Boolean
+        get() {
+            return currentRules.all { r -> !r.status.alive }
         }
 }