From d31f3ae6d82dfb80bfe5db437b118050e4d2b79f Mon Sep 17 00:00:00 2001
From: lisonge <i@songe.li>
Date: Mon, 16 Oct 2023 16:06:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E7=9F=A5=E6=A0=8F=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E7=BB=84=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/li/songe/gkd/service/ManageService.kt | 3 ++-
 app/src/main/java/li/songe/gkd/ui/ControlVm.kt          | 3 ++-
 2 files changed, 4 insertions(+), 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
index 1f9368d10..91463825e 100644
--- 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
index c5b0fd9b8..36f6498d0 100644
--- 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 {