fix: actionMaximum/actionCd 失效 (#306)

gkd-kit · Nov 22, 2023 · bfd7f59 · bfd7f59
1 parent e86258e
commit bfd7f59
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/li/songe/gkd/data/Rule.kt b/app/src/main/java/li/songe/gkd/data/Rule.kt
@@ -70,7 +70,7 @@ data class Rule(
             ?: app.actionCd
         } else {
             null
-        }) ?: rule.actionCd ?: defaultMiniCd)
+        }) ?: rule.actionCd ?: group.actionCd ?: app.actionCd ?: defaultMiniCd)
     )
     var actionTriggerTime = Value(0L)
     fun trigger() {
@@ -89,7 +89,7 @@ data class Rule(
             ?: group.actionMaximum ?: app.actionMaximum
     } else {
         null
-    }) ?: rule.actionMaximum)
+    }) ?: rule.actionMaximum ?: group.actionMaximum ?: app.actionMaximum)
 
     var actionCount = Value(0)