一堆优化

Author: lzy98276

CHANGELOG/v2.2.0/CHANGELOG.md

@@ -9,15 +9,14 @@ v2.0 - Koharu（小鸟游星野） release 3
 
 ## 💡 功能优化
 
-- 优化 **动画流畅性**，新增控件复用减少重绘开销
+- 优化 **闪抽动画日志**，减少不必要的日志输出
 - 优化 **动画性能**，新增数据缓存减少频繁IO操作
 - 优化 **通知渠道选择**，新增ClassIsland使用提示
 - 优化 **浮窗点击识别**，减少误识别为拖动
 - 优化 **安全验证逻辑**，统一使用项目验证系统
 - 优化 **软件退出**，解决退出缓慢问题
 - 优化 **URL 注册**，无需管理员权限即可完成
 - 优化 **TEMP 清理**，仅清理 TEMP 文件夹
-- 优化 **日志记录**，描述错误问题
 - 优化 **历史记录表格**，未设置性别/小组则隐藏对应列
 - 优化 **音乐播放延迟**，减少文件读取和音频流初始化开销
 
@@ -29,9 +28,6 @@ v2.0 - Koharu（小鸟游星野） release 3
 - 修复 **重启功能**，解决无法重启异常
 - 修复 **URL 注册**，修复注册失败问题
 - 修复 **收纳浮窗无焦点**，修复无焦点模式未生效
-- 修复 **自动播放动画**，修复次数不准确导致的卡顿问题
-- 修复 **手动停止动画**，修复动画闪几下后停止的问题
-- 修复 **浮窗通知闪烁**，修复更新标签时导致的闪烁问题
 - 修复 **ClassIsland通知渠道显示时长**，修复时间未生效问题
 
 ## 🔧 其它变更

app/common/display/result_display.py

@@ -699,14 +699,57 @@ def update_grid_labels(result_grid, new_labels, cached_labels):
                         new_item = new_layout.itemAt(j)
 
                         if old_item and new_item:
-                            old_label = old_item.widget()
-                            new_label = new_item.widget()
-
-                            if isinstance(old_label, BodyLabel) and isinstance(
-                                new_label, BodyLabel
+                            old_content = old_item.widget()
+                            new_content = new_item.widget()
+
+                            # 如果内容是容器（带头像的情况），更新其内部组件
+                            if old_content.layout() and new_content.layout():
+                                old_inner_layout = old_content.layout()
+                                new_inner_layout = new_content.layout()
+
+                                for k in range(
+                                    min(
+                                        old_inner_layout.count(),
+                                        new_inner_layout.count(),
+                                    )
+                                ):
+                                    old_inner_item = old_inner_layout.itemAt(k)
+                                    new_inner_item = new_inner_layout.itemAt(k)
+
+                                    if old_inner_item and new_inner_item:
+                                        old_inner_widget = old_inner_item.widget()
+                                        new_inner_widget = new_inner_item.widget()
+
+                                        # 更新文本标签
+                                        if isinstance(
+                                            old_inner_widget, BodyLabel
+                                        ) and isinstance(new_inner_widget, BodyLabel):
+                                            old_inner_widget.setText(
+                                                new_inner_widget.text()
+                                            )
+                                            old_inner_widget.setStyleSheet(
+                                                new_inner_widget.styleSheet()
+                                            )
+
+                                        # 更新头像组件
+                                        from qfluentwidgets import AvatarWidget
+
+                                        if isinstance(
+                                            old_inner_widget, AvatarWidget
+                                        ) and isinstance(
+                                            new_inner_widget, AvatarWidget
+                                        ):
+                                            old_image = old_inner_widget.getImage()
+                                            new_image = new_inner_widget.getImage()
+                                            if old_image != new_image:
+                                                old_inner_widget.setImage(new_image)
+
+                            # 如果内容是直接标签（不带头像的情况）
+                            elif isinstance(old_content, BodyLabel) and isinstance(
+                                new_content, BodyLabel
                             ):
-                                old_label.setText(new_label.text())
-                                old_label.setStyleSheet(new_label.styleSheet())
+                                old_content.setText(new_content.text())
+                                old_content.setStyleSheet(new_content.styleSheet())
 
         cached_labels[:] = new_labels
 
@@ -739,7 +782,12 @@ def clear_grid(result_grid, log_debug=False):
 
     @staticmethod
     def show_notification_if_enabled(
-        class_name, selected_students, draw_count=1, settings=None, settings_group=None
+        class_name,
+        selected_students,
+        draw_count=1,
+        settings=None,
+        settings_group=None,
+        is_animating=False,
     ):
         """
         如果启用了通知服务，则显示抽取结果通知
@@ -749,14 +797,21 @@ def show_notification_if_enabled(
             selected_students: 选中的学生列表
             draw_count: 抽取人数
             settings: 通知设置参数
+            settings_group: 设置组名称
+            is_animating: 是否在动画过程中，如果是则不启动自动关闭定时器
         """
         # 检查是否启用了通知服务（这个检查应该由调用方完成）
         from app.common.notification.notification_service import (
             show_roll_call_notification,
         )
 
         show_roll_call_notification(
-            class_name, selected_students, draw_count, settings, settings_group
+            class_name,
+            selected_students,
+            draw_count,
+            settings,
+            settings_group,
+            is_animating,
         )
 
     @staticmethod

app/common/notification/notification_service.py

@@ -158,9 +158,6 @@ def __init__(self, parent=None):
         # 关闭动画
         self.hide_animation = None
 
-        # 缓存的标签，用于复用
-        self.cached_student_labels = []
-
         # 启动周期性置顶
         self._start_periodic_topmost()
 
@@ -321,8 +318,14 @@ def update_drag_line_style(self):
                 }}
             """)
 
-    def apply_settings(self, settings=None, settings_group=None):
-        """应用设置到通知窗口"""
+    def apply_settings(self, settings=None, settings_group=None, is_animating=False):
+        """应用设置到通知窗口
+
+        Args:
+            settings: 设置字典
+            settings_group: 设置组名称
+            is_animating: 是否在动画过程中，如果是则不启动自动关闭定时器
+        """
         if settings:
             # 使用传递的设置
             transparency = settings.get("transparency", 0.6)
@@ -354,8 +357,8 @@ def apply_settings(self, settings=None, settings_group=None):
         # 根据设置定位窗口
         self.position_window(settings)
 
-        # 设置自动关闭时间
-        if auto_close_time > 0:
+        # 设置自动关闭时间（仅在非动画状态下启动）
+        if auto_close_time > 0 and not is_animating:
             self.auto_close_timer.stop()
             self.auto_close_timer.setInterval(auto_close_time * 1000)  # 转换为毫秒
             # 初始化倒计时并启动更新定时器
@@ -786,7 +789,7 @@ def update_content(
         font_settings_group=None,
         settings_group=None,
     ):
-        """更新通知窗口的内容（优化版，复用控件避免闪烁）
+        """更新通知窗口的内容
 
         Args:
             student_labels: 包含学生信息的BodyLabel控件列表
@@ -809,31 +812,15 @@ def update_content(
         if not student_labels:
             return
 
-        min_count = min(len(student_labels), len(self.cached_student_labels))
-
-        for i in range(min_count):
-            old_widget = self.cached_student_labels[i]
-            new_widget = student_labels[i]
-
-            if old_widget and new_widget:
-                old_layout = old_widget.layout()
-                new_layout = new_widget.layout()
-
-                if old_layout and new_layout:
-                    for j in range(min(old_layout.count(), new_layout.count())):
-                        old_item = old_layout.itemAt(j)
-                        new_item = new_layout.itemAt(j)
-
-                        if old_item and new_item:
-                            old_label = old_item.widget()
-                            new_label = new_item.widget()
-
-                            if old_label and new_label:
-                                old_label.setText(new_label.text())
-                                old_label.setStyleSheet(new_label.styleSheet())
+        # 清除所有旧控件
+        while self.content_layout.count():
+            item = self.content_layout.takeAt(0)
+            widget = item.widget()
+            if widget:
+                widget.deleteLater()
 
-        for i in range(min_count, len(student_labels)):
-            label = student_labels[i]
+        # 添加新控件
+        for label in student_labels:
             # 如果有字体设置，则应用到标签上
             if font_settings_group:
                 # 检查是否使用全局字体
@@ -853,13 +840,6 @@ def update_content(
                         )
             self.content_layout.addWidget(label)
 
-        for i in range(min_count, len(self.cached_student_labels)):
-            widget = self.cached_student_labels[i]
-            self.content_layout.removeWidget(widget)
-            widget.deleteLater()
-
-        self.cached_student_labels = student_labels
-
         # 确保颜色与当前主题同步
         try:
             self._on_theme_changed()
@@ -925,6 +905,7 @@ def send_to_classisland(
         settings=None,
         settings_group=None,
         fallback_on_error=True,
+        is_animating=False,
     ):
         """发送通知到ClassIsland
 
@@ -935,6 +916,7 @@ def send_to_classisland(
             settings: 通知设置参数
             settings_group: 设置组名称
             fallback_on_error: 是否在错误时回退到内置通知
+            is_animating: 是否在动画过程中，如果是则不启动自动关闭定时器
         """
 
         try:
@@ -953,6 +935,7 @@ def send_to_classisland(
                         draw_count,
                         settings,
                         settings_group,
+                        is_animating,
                     )
                 else:
                     logger.warning("发送通知到ClassIsland失败")
@@ -962,7 +945,12 @@ def send_to_classisland(
             if fallback_on_error:
                 logger.info("因错误回退到SecRandom通知服务")
                 self._show_secrandom_notification(
-                    class_name, selected_students, draw_count, settings, settings_group
+                    class_name,
+                    selected_students,
+                    draw_count,
+                    settings,
+                    settings_group,
+                    is_animating,
                 )
             else:
                 logger.warning("发送通知到ClassIsland时出错，但不回退")
@@ -974,8 +962,18 @@ def _show_secrandom_notification(
         draw_count=1,
         settings=None,
         settings_group=None,
+        is_animating=False,
     ):
-        """显示SecRandom内置通知（用于回退）"""
+        """显示SecRandom内置通知（用于回退）
+
+        Args:
+            class_name: 班级名称
+            selected_students: 选中的学生列表 [(学号, 姓名, 是否存在), ...]
+            draw_count: 抽取的学生数量
+            settings: 通知设置参数
+            settings_group: 设置组名称
+            is_animating: 是否在动画过程中，如果是则不启动自动关闭定时器
+        """
         # 重新调用SecRandom通知服务，使用原始的show_roll_call_result逻辑
         if settings:
             font_size = settings.get("font_size", 50)
@@ -1034,10 +1032,14 @@ def _show_secrandom_notification(
         if settings:
             display_duration = settings.get("notification_display_duration", 5)
             window.apply_settings(
-                {**settings, "auto_close_time": display_duration}, settings_group
+                {**settings, "auto_close_time": display_duration},
+                settings_group,
+                is_animating,
             )
         else:
-            window.apply_settings({"auto_close_time": 5}, settings_group)  # 默认5秒
+            window.apply_settings(
+                {"auto_close_time": 5}, settings_group, is_animating
+            )  # 默认5秒
 
         window.update_content(
             student_labels, settings, font_settings_group, settings_group
@@ -1063,6 +1065,7 @@ def show_roll_call_result(
         draw_count=1,
         settings=None,
         settings_group=None,
+        is_animating=False,
     ):
         """在浮动通知窗口中显示点名结果
 
@@ -1072,6 +1075,7 @@ def show_roll_call_result(
             draw_count: 抽取的学生数量
             settings: 通知设置参数
             settings_group: 设置组名称，默认为notification_settings
+            is_animating: 是否在动画过程中，如果是则不启动自动关闭定时器
         """
         # 获取通知服务类型设置
         notification_service_type = 0  # 默认为SecRandom通知服务
@@ -1087,7 +1091,12 @@ def show_roll_call_result(
         # 如果选择了ClassIsland通知服务，则发送到ClassIsland
         if notification_service_type == 1:  # 1 表示 ClassIsland 通知服务
             self.send_to_classisland(
-                class_name, selected_students, draw_count, settings, settings_group
+                class_name,
+                selected_students,
+                draw_count,
+                settings,
+                settings_group,
+                is_animating=is_animating,
             )
             return
 
@@ -1101,6 +1110,7 @@ def show_roll_call_result(
                 settings,
                 settings_group,
                 fallback_on_error=False,
+                is_animating=is_animating,
             )
             # 继续执行下面的内置通知逻辑，不return
 
@@ -1163,10 +1173,14 @@ def show_roll_call_result(
         if settings:
             display_duration = settings.get("notification_display_duration", 5)
             window.apply_settings(
-                {**settings, "auto_close_time": display_duration}, settings_group
+                {**settings, "auto_close_time": display_duration},
+                settings_group,
+                is_animating,
             )
         else:
-            window.apply_settings({"auto_close_time": 5}, settings_group)  # 默认5秒
+            window.apply_settings(
+                {"auto_close_time": 5}, settings_group, is_animating
+            )  # 默认5秒
 
         window.update_content(
             student_labels, settings, font_settings_group, settings_group
@@ -1183,7 +1197,12 @@ def close_all_notifications(self):
 
 
 def show_roll_call_notification(
-    class_name, selected_students, draw_count=1, settings=None, settings_group=None
+    class_name,
+    selected_students,
+    draw_count=1,
+    settings=None,
+    settings_group=None,
+    is_animating=False,
 ):
     """显示点名通知的便捷函数
 
@@ -1192,8 +1211,15 @@ def show_roll_call_notification(
         selected_students: 选中的学生列表 [(学号, 姓名, 是否存在), ...]
         draw_count: 抽取的学生数量
         settings: 通知设置参数
+        settings_group: 设置组名称
+        is_animating: 是否在动画过程中，如果是则不启动自动关闭定时器
     """
     manager = FloatingNotificationManager()
     manager.show_roll_call_result(
-        class_name, selected_students, draw_count, settings, settings_group
+        class_name,
+        selected_students,
+        draw_count,
+        settings,
+        settings_group,
+        is_animating,
     )