fix: 通知栏规则组数量显示不正确

shier144 · Oct 16, 2023 · d31f3ae · d31f3ae
1 parent 8762d0e
commit d31f3ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/java/li/songe/gkd/service/ManageService.kt b/app/src/main/java/li/songe/gkd/service/ManageService.kt
@@ -82,7 +82,8 @@ class ManageService : CompositionService({
         combine(appIdToRulesFlow, clickCountFlow, storeFlow) { appIdToRules, clickCount, store ->
             if (!store.enableService) return@combine "服务已暂停"
             val appSize = appIdToRules.keys.size
-            val groupSize = appIdToRules.values.sumOf { r -> r.size }
+            val groupSize =
+                appIdToRules.values.sumOf { rules -> rules.map { r -> r.group.key }.toSet().size }
             (if (groupSize > 0) {
                 "${appSize}应用/${groupSize}规则组"
             } else {

diff --git a/app/src/main/java/li/songe/gkd/ui/ControlVm.kt b/app/src/main/java/li/songe/gkd/ui/ControlVm.kt
@@ -39,7 +39,8 @@ class ControlVm @Inject constructor() : ViewModel() {
 
     val subsStatusFlow = combine(appIdToRulesFlow, clickCountFlow) { appIdToRules, clickCount ->
         val appSize = appIdToRules.keys.size
-        val groupSize = appIdToRules.values.flatten().map { r -> r.group.hashCode() }.toSet().size
+        val groupSize =
+            appIdToRules.values.sumOf { rules -> rules.map { r -> r.group.key }.toSet().size }
         (if (groupSize > 0) {
             "${appSize}应用/${groupSize}规则组"
         } else {