修复 **通知服务**，超阈不再发送通知

Author: lzy98276

CHANGELOG/v2.3.0-beta.2/CHANGELOG.md

@@ -21,7 +21,7 @@ v2.3 - Shiroko (砂狼白子) beta 2
 - 修复 **点名/抽奖**，重置后人数标签不更新
 - 修复 **半重复**，重置后历史缓存未刷新
 - 修复 **抽奖小组模式**，多项显示缺失
-- 修复 **通知服务**，超阈仍发ClassIsland
+- 修复 **通知服务**，超阈不再发送通知
 
 ## 🔧 其它变更
 

app/common/notification/notification_service.py

@@ -1213,7 +1213,7 @@ def show_roll_call_result(
             is_animating: 是否在动画过程中，如果是则不启动自动关闭定时器
         """
         notification_service_type = 0
-        suppress_secrandom_notification = False
+        exceed_threshold = False
         if settings_group:
             try:
                 notification_service_type = readme_settings_async(
@@ -1230,12 +1230,14 @@ def show_roll_call_result(
                 max_notify_count = readme_settings_async(
                     settings_group, "main_window_display_threshold"
                 )
-                if use_main_window_when_exceed_threshold and int(draw_count or 0) > int(
-                    max_notify_count or 0
-                ):
-                    suppress_secrandom_notification = True
+                exceed_threshold = use_main_window_when_exceed_threshold and int(
+                    draw_count or 0
+                ) > int(max_notify_count or 0)
             except Exception:
-                suppress_secrandom_notification = False
+                exceed_threshold = False
+
+        if exceed_threshold:
+            return
 
         # 如果选择了ClassIsland通知服务，则发送到ClassIsland
         if notification_service_type == 1:  # 1 表示 ClassIsland 通知服务
@@ -1245,7 +1247,6 @@ def show_roll_call_result(
                 draw_count,
                 settings,
                 settings_group,
-                fallback_on_error=not suppress_secrandom_notification,
                 is_animating=is_animating,
             )
             return
@@ -1262,19 +1263,16 @@ def show_roll_call_result(
                 fallback_on_error=False,
                 is_animating=is_animating,
             )
-            if suppress_secrandom_notification:
-                return
 
         # 否则使用SecRandom浮窗通知
-        if not suppress_secrandom_notification:
-            self._show_secrandom_notification(
-                class_name,
-                selected_students,
-                draw_count,
-                settings,
-                settings_group,
-                is_animating,
-            )
+        self._show_secrandom_notification(
+            class_name,
+            selected_students,
+            draw_count,
+            settings,
+            settings_group,
+            is_animating,
+        )
 
     def close_all_notifications(self):
         """关闭所有浮动通知窗口"""