新增 **通知渠道**，新增「SecRandom+ClassIsland」选项

Author: lzy98276

CHANGELOG/v2.2.0/CHANGELOG.md

@@ -3,7 +3,7 @@ v2.0 - Koharu（小鸟游星野） release 3
 
 ## 🚀 主要更新
 
-- 无
+- 新增 **通知渠道**，新增「SecRandom+ClassIsland」选项
 
 ## 💡 功能优化
 

app/Language/modules/notification_settings.py

@@ -98,8 +98,12 @@
         },
         "notification_service_type": {
             "name": "通知服务类型",
-            "description": "选择通知服务类型，内置服务或ClassIsland",
-            "combo_items": ["内置通知服务", "ClassIsland通知服务"],
+            "description": "选择通知服务类型，SecRandom或ClassIsland",
+            "combo_items": [
+                "SecRandom",
+                "ClassIsland",
+                "SecRandom+ClassIsland",
+            ],
         },
         "notification_display_duration": {
             "name": "通知显示时长",
@@ -183,8 +187,9 @@
             "name": "Notification service type",
             "description": "Select notification service type, SecRandom or ClassIsland",
             "combo_items": [
-                "SecRandom Notification Service",
-                "ClassIsland Notification Service",
+                "SecRandom",
+                "ClassIsland",
+                "SecRandom + ClassIsland",
             ],
         },
         "notification_display_duration": {
@@ -259,8 +264,8 @@
         },
         "notification_service_type": {
             "name": "通知服务类型",
-            "description": "选择通知服务类型，内置服务或ClassIsland",
-            "combo_items": ["内置通知服务", "ClassIsland通知服务"],
+            "description": "选择通知服务类型，SecRandom或ClassIsland",
+            "combo_items": ["SecRandom", "ClassIsland", "SecRandom+ClassIsland"],
         },
         "notification_display_duration": {
             "name": "通知显示时长",
@@ -327,8 +332,9 @@
             "name": "Notification service type",
             "description": "Select notification service type, SecRandom or ClassIsland",
             "combo_items": [
-                "SecRandom Notification Service",
-                "ClassIsland Notification Service",
+                "SecRandom",
+                "ClassIsland",
+                "SecRandom + ClassIsland",
             ],
         },
         "notification_display_duration": {
@@ -413,8 +419,12 @@
         },
         "notification_service_type": {
             "name": "通知服务类型",
-            "description": "选择通知服务类型，内置服务或ClassIsland",
-            "combo_items": ["内置通知服务", "ClassIsland通知服务"],
+            "description": "选择通知服务类型，SecRandom或ClassIsland",
+            "combo_items": [
+                "SecRandom",
+                "ClassIsland",
+                "SecRandom+ClassIsland",
+            ],
         },
         "notification_display_duration": {
             "name": "通知显示时长",
@@ -493,8 +503,9 @@
             "name": "Notification service type",
             "description": "Select notification service type, SecRandom or ClassIsland",
             "combo_items": [
-                "SecRandom Notification Service",
-                "ClassIsland Notification Service",
+                "SecRandom",
+                "ClassIsland",
+                "SecRandom + ClassIsland",
             ],
         },
         "notification_display_duration": {

app/common/notification/notification_service.py

@@ -946,6 +946,7 @@ def send_to_classisland(
         draw_count=1,
         settings=None,
         settings_group=None,
+        fallback_on_error=True,
     ):
         """发送通知到ClassIsland
 
@@ -955,6 +956,7 @@ def send_to_classisland(
             draw_count: 抽取的学生数量
             settings: 通知设置参数
             settings_group: 设置组名称
+            fallback_on_error: 是否在错误时回退到内置通知
         """
 
         try:
@@ -965,17 +967,27 @@ def send_to_classisland(
             if status:
                 logger.info("成功发送通知到ClassIsland，结果未知")
             else:
+                if fallback_on_error:
+                    logger.info("因错误回退到SecRandom通知服务")
+                    self._show_secrandom_notification(
+                        class_name,
+                        selected_students,
+                        draw_count,
+                        settings,
+                        settings_group,
+                    )
+                else:
+                    logger.warning("发送通知到ClassIsland失败")
+        except Exception as e:
+            logger.exception("发送通知到ClassIsland时出错: {}", e)
+            # 如果发生异常，回退到SecRandom通知服务
+            if fallback_on_error:
                 logger.info("因错误回退到SecRandom通知服务")
                 self._show_secrandom_notification(
                     class_name, selected_students, draw_count, settings, settings_group
                 )
-        except Exception as e:
-            logger.exception("发送通知到ClassIsland时出错: {}", e)
-            # 如果发生异常，回退到SecRandom通知服务
-            logger.info("因错误回退到SecRandom通知服务")
-            self._show_secrandom_notification(
-                class_name, selected_students, draw_count, settings, settings_group
-            )
+            else:
+                logger.warning("发送通知到ClassIsland时出错，但不回退")
 
     def _show_secrandom_notification(
         self,
@@ -1101,6 +1113,19 @@ def show_roll_call_result(
             )
             return
 
+        # 如果选择了内置+ClassIsland通知服务，则同时发送到两个服务
+        if notification_service_type == 2:  # 2 表示 内置+ClassIsland 通知服务
+            # 先发送到ClassIsland，不回退（因为会继续显示内置通知）
+            self.send_to_classisland(
+                class_name,
+                selected_students,
+                draw_count,
+                settings,
+                settings_group,
+                fallback_on_error=False,
+            )
+            # 继续执行下面的内置通知逻辑，不return
+
         # 否则使用SecRandom浮窗通知
         # 获取设置
         if settings: