完成bug修复

Author: lzy98276

app/Language/modules/more_settings.py

@@ -252,6 +252,7 @@
             "contributor_role_5": "创意、维护",
             "contributor_role_6": "应用测试、文档、安装包制作",
             "contributor_role_7": "响应式前端页面\n设计及维护、文档",
+            "contributor_role_10": "ClassIsland 插件\nClassIsland 联动",
         },
         "donation": {"name": "捐赠支持", "description": "支持项目发展，感谢您的捐赠"},
         "website": {"name": "SecRandom 官网", "description": "访问SecRandom软件官网"},
@@ -275,6 +276,7 @@
             "contributor_role_5": "Creativity & Maintenance",
             "contributor_role_6": "Test & Documentation & Install Package Making",
             "contributor_role_7": "Responsive frontend page Design and Maintenance & Documentation",
+            "contributor_role_10": "Test & Documentation & Install Package Making",
         },
         "donation": {"name": "Donate", "description": "Buy me a coffee"},
         "check_update": {

app/common/IPC_URL/csharp_ipc_handler.py

@@ -67,6 +67,7 @@ def __init__(self):
             self.is_running = False
             self.is_connected = False
             self._disconnect_logged = False  # 跟踪是否已记录断连日志
+            self._last_on_class_left_log_time = 0  # 上次记录距离上课时间的时间
 
         def start_ipc_client(self) -> bool:
             """
@@ -141,6 +142,43 @@ def is_breaking(self) -> bool:
             )
             return state
 
+        def get_on_class_left_time(self) -> int:
+            """获取距离上课剩余时间（秒）
+
+            Returns:
+                int: 距离上课的剩余时间（秒），如果当前正在上课或没有下一节课程则返回0
+            """
+            try:
+                import time
+
+                lessonSc = GeneratedIpcFactory.CreateIpcProxy[IPublicLessonsService](
+                    self.ipc_client.Provider, self.ipc_client.PeerProxy
+                )
+                on_class_left_time = lessonSc.OnClassLeftTime
+                total_seconds = int(on_class_left_time.TotalSeconds)
+
+                # 根据距离上课的时间调整日志记录频率
+                # 距离上课3秒前：每30秒记录一次
+                # 距离上课3秒内：每秒记录一次
+                current_time = time.time()
+                should_log = False
+
+                if total_seconds > 0 and total_seconds <= 3:
+                    # 3秒内，每秒记录一次
+                    should_log = True
+                elif current_time - self._last_on_class_left_log_time >= 30:
+                    # 3秒前，每30秒记录一次
+                    should_log = True
+                    self._last_on_class_left_log_time = current_time
+
+                if should_log:
+                    logger.debug(f"获取到的距离上课剩余时间: {total_seconds} 秒")
+
+                return total_seconds
+            except Exception as e:
+                logger.error(f"获取距离上课时间失败: {e}")
+                return 0
+
         @staticmethod
         def convert_to_call_result(
             class_name: str, selected_students, draw_count: int, display_duration=5.0
@@ -270,6 +308,14 @@ def is_breaking(self) -> bool:
             """是否处于下课时间"""
             return False
 
+        def get_on_class_left_time(self) -> int:
+            """获取距离上课剩余时间（秒）
+
+            Returns:
+                int: 距离上课的剩余时间（秒），如果当前正在上课或没有下一节课程则返回0
+            """
+            return 0
+
         @staticmethod
         def convert_to_call_result(
             class_name: str, selected_students, draw_count: int, display_duration=5.0

app/common/IPC_URL/url_command_handler.py

@@ -24,7 +24,6 @@ class URLCommandHandler(QObject):
     showMainPageRequested = Signal(str)  # 请求显示主页面
     showTrayActionRequested = Signal(str)  # 请求执行托盘操作
     securityVerificationRequested = Signal(str, dict)  # 请求安全验证
-    classIslandDataReceived = Signal(dict)  # 接收ClassIsland数据信号
 
     def __init__(self, main_window=None):
         super().__init__()
@@ -63,8 +62,6 @@ def __init__(self, main_window=None):
             "open": self._handle_open,
             "action": self._handle_action,
             "verify": self._handle_verify,
-            # ClassIsland数据命令
-            "data/class_island": self._handle_class_island_data,
         }
 
         # 需要密码验证的命令列表
@@ -637,74 +634,6 @@ def _handle_verify(self, params: Dict[str, Any]) -> Dict[str, Any]:
         # 这里可以实现具体的验证逻辑
         return {"status": "success", "message": "验证通过", "verified": True}
 
-    def _handle_class_island_data(self, params: Dict[str, Any]) -> Dict[str, Any]:
-        """处理ClassIsland数据
-        接收包含课程表信息的JSON数据
-
-        Args:
-            params: 包含ClassIsland数据的参数字典
-                   预期包含以下字段:
-                   - data: ClassIsland发送的课程表数据
-                   - CurrentSubject: 当前所处时间点的科目
-                   - NextClassSubject: 下一节课的科目
-                   - CurrentState: 当前时间点状态
-                   - CurrentTimeLayoutItem: 当前所处的时间点
-                   - CurrentClassPlan: 当前加载的课表
-                   - NextBreakingTimeLayoutItem: 下一个课间休息类型的时间点
-                   - NextClassTimeLayoutItem: 下一个上课类型的时间点
-                   - CurrentSelectedIndex: 当前所处时间点的索引
-                   - OnClassLeftTime: 距离上课剩余时间
-                   - OnBreakingTimeLeftTime: 距下课剩余时间
-                   - IsClassPlanEnabled: 是否启用课表
-                   - IsClassPlanLoaded: 是否已加载课表
-                   - IsLessonConfirmed: 是否已确定当前时间点
-        """
-        logger.debug("处理ClassIsland数据")
-
-        # 从参数中获取ClassIsland数据
-        class_island_data = params.get("data", {})
-
-        if not class_island_data:
-            logger.warning("收到空的ClassIsland数据")
-            return {"status": "error", "message": "ClassIsland数据不能为空"}
-
-        # 验证必要的字段是否存在
-        required_fields = [
-            "CurrentSubject",
-            "NextClassSubject",
-            "CurrentState",
-            "CurrentTimeLayoutItem",
-            "CurrentClassPlan",
-            "NextBreakingTimeLayoutItem",
-            "NextClassTimeLayoutItem",
-            "CurrentSelectedIndex",
-            "OnClassLeftTime",
-            "OnBreakingTimeLeftTime",
-            "IsClassPlanEnabled",
-            "IsClassPlanLoaded",
-            "IsLessonConfirmed",
-        ]
-
-        for field in required_fields:
-            if field not in class_island_data:
-                logger.warning(f"ClassIsland数据缺少必要字段: {field}")
-
-        # 发射信号，让主窗口处理ClassIsland数据
-        try:
-            self.classIslandDataReceived.emit(class_island_data)
-            logger.debug("ClassIsland数据已发送到主窗口处理")
-            return {
-                "status": "success",
-                "message": "ClassIsland数据已接收并处理",
-                "data_received": True,
-            }
-        except Exception as e:
-            logger.error(f"发送ClassIsland数据信号失败: {e}")
-            return {
-                "status": "error",
-                "message": f"发送ClassIsland数据信号失败: {str(e)}",
-            }
-
     def register_command(
         self,
         command: str,

app/common/extraction/extract.py

@@ -192,6 +192,52 @@ def _get_class_times_by_day(day_of_week: int) -> Dict[str, str]:
     return parser.get_class_times_by_day(day_of_week)
 
 
+def _get_seconds_to_next_class() -> int:
+    """获取距离下一节课的剩余时间（秒）
+
+    Returns:
+        int: 距离下一节课的剩余秒数，如果没有下一节课则返回0
+    """
+    try:
+        current_day_of_week = _get_current_day_of_week()
+        class_times = _get_class_times_by_day(current_day_of_week)
+
+        if not class_times or not isinstance(class_times, dict):
+            return 0
+
+        current_total_seconds = _get_current_time_in_seconds()
+
+        # 将上课时间段按开始时间排序
+        time_ranges = []
+        for range_name, time_range in class_times.items():
+            try:
+                start_end = time_range.split("-")
+                if len(start_end) != 2:
+                    continue
+
+                start_time_str, end_time_str = start_end
+                start_total_seconds = _parse_time_string_to_seconds(start_time_str)
+                time_ranges.append((start_total_seconds, range_name))
+            except Exception as e:
+                logger.error(f"解析时间段失败: {range_name} = {time_range}, 错误: {e}")
+                continue
+
+        # 按开始时间排序
+        time_ranges.sort(key=lambda x: x[0])
+
+        # 找到下一个上课时间段
+        for start_seconds, range_name in time_ranges:
+            if start_seconds > current_total_seconds:
+                return start_seconds - current_total_seconds
+
+        # 如果当天没有下一节课，返回0
+        return 0
+
+    except Exception as e:
+        logger.error(f"计算距离下一节课时间失败: {e}")
+        return 0
+
+
 def _get_non_class_times_config() -> Dict[str, str]:
     """获取非上课时间段配置
 

app/page_building/settings_window_page.py

@@ -159,10 +159,6 @@ def __init__(self, parent: QFrame = None, is_preview=False):
 
         if readme_settings_async("basic_settings", "simplified_mode"):
             page_config = {}
-            if show_behind_scenes:
-                page_config["behind_scenes_settings"] = get_content_name_async(
-                    "behind_scenes_settings", "title"
-                )
             page_config["course_settings"] = get_content_name_async(
                 "course_settings", "title"
             )

app/tools/settings_default_storage.py

@@ -435,9 +435,7 @@
         "verification_required": {"default_value": True},
         "instant_draw_disable": {"default_value": False},
         "class_island_source_enabled": {"default_value": False},
-        "current_class_island_break_status": {"default_value": False},
-        "last_class_island_state": {"default_value": ""},
-        "pre_class_reset_enabled": {"default_value": True},
+        "pre_class_reset_enabled": {"default_value": False},
         "pre_class_reset_time": {"default_value": 120},
     },
     "fair_draw_settings": {

app/tools/url_handler.py

@@ -43,10 +43,6 @@ def __init__(self, app_name: str = "SecRandom", protocol_name: str = "secrandom"
         self.command_handler.showTrayActionRequested.connect(
             self.showTrayActionRequested.emit
         )
-        # 连接ClassIsland数据信号
-        self.command_handler.classIslandDataReceived.connect(
-            self._handle_class_island_data
-        )
 
     def parse_command_line_args(self) -> Optional[Dict[str, Any]]:
         """
@@ -172,10 +168,6 @@ def check_single_instance(self) -> bool:
             self.url_ipc_handler.register_message_handler(
                 "url", self._handle_ipc_url_message
             )
-            # 注册ClassIsland数据消息处理器
-            self.url_ipc_handler.register_message_handler(
-                "class_island_data", self._handle_ipc_class_island_message
-            )
             return True
         else:
             return False
@@ -190,28 +182,6 @@ def _handle_ipc_url_message(self, payload: Dict[str, Any]) -> Dict[str, Any]:
         else:
             return {"success": False, "error": "缺少URL参数"}
 
-    def _handle_ipc_class_island_message(
-        self, payload: Dict[str, Any]
-    ) -> Dict[str, Any]:
-        """
-        处理IPC ClassIsland数据消息
-
-        Args:
-            payload: 包含ClassIsland数据的负载
-
-        Returns:
-            处理结果
-        """
-        class_island_data = payload.get("data", {})
-        if class_island_data:
-            # 调用command_handler处理ClassIsland数据
-            # 构建参数字典，包含ClassIsland数据
-            params = {"data": class_island_data}
-            # 使用command_handler的_class_island_data方法处理数据
-            return self.command_handler._handle_class_island_data(params)
-        else:
-            return {"success": False, "error": "缺少ClassIsland数据参数"}
-
     def send_url_to_existing_instance(self, url: str) -> bool:
         """
         发送URL到已存在的实例
@@ -231,21 +201,6 @@ def send_url_to_existing_instance(self, url: str) -> bool:
         else:
             return False
 
-    def _handle_class_island_data(self, class_island_data: dict):
-        """
-        处理ClassIsland数据
-
-        Args:
-            class_island_data: ClassIsland发送的数据
-        """
-        # 将ClassIsland数据信号转发给主窗口
-        # 这里可以添加额外的处理逻辑
-        logger.info("URLHandler接收到ClassIsland数据")
-
-        # 发射信号，让主窗口处理数据
-        # 注意：URLHandler本身不直接处理UI逻辑，只是转发信号
-        self.classIslandDataReceived.emit(class_island_data)
-
 
 def handle_url_arguments() -> Optional[Dict[str, Any]]:
     """

app/view/another_window/contributor.py

@@ -112,6 +112,16 @@ def _init_data(self):
                 "github": "https://github.com/jursin",
                 "avatar": str(get_data_path("assets/contribution", "contributor7.png")),
             },
+            {
+                "name": "lrs2187",
+                "role": get_any_position_value_async(
+                    "about", "contributor", "contributor_role_10"
+                ),
+                "github": "https://github.com/lrsgzs",
+                "avatar": str(
+                    get_data_path("assets/contribution", "contributor10.png")
+                ),
+            },
             {
                 "name": "LHGS-github",
                 "role": get_any_position_value_async(