优化&新增&修复 一些体验

Author: lzy98276

CHANGELOG/v2.2.6/CHANGELOG.md

@@ -10,7 +10,9 @@ v2.3 - Shirako (砂狼白子) beta 1
 ## 💡 功能优化
 
 - 优化 **备份管理**，恢复备份的对话框文本改为对应内容
+- 优化 **备份管理**，上限为0时不限制
 - 优化 **结果显示布局**，使用流式布局显示
+- 优化 **结果显示**，预计算最终结果减少卡顿
 - 优化 **抽取临时记录**，区分点名/抽奖文件名
 - 优化 **课前重置**，仅清除抽取临时记录
 - 优化 **闪抽设置**，移除清除记录项
@@ -19,9 +21,12 @@ v2.3 - Shirako (砂狼白子) beta 1
 
 ## 🐛 修复问题
 
+- 修复 **闪抽结果显示**，动画结束重复抽取
+- 修复 **闪抽语音播报**，结果与显示不一致
 - 修复 **版本号更新脚本**，修复 DEV_VERSION 被误更新的问题
 - 修复 **抽取记录读取**，兼容旧格式
 - 修复 **通知浮窗显示**，首帧尺寸与上下间距异常
+- 修复 **应用重启**，无法重启问题
 
 ## 🔧 其它变更
 

app/Language/modules/basic_settings.py

@@ -113,7 +113,7 @@
         },
         "backup_auto_max_count": {
             "name": "自动备份上限",
-            "description": "设置自动备份最多保留数量（个）",
+            "description": "设置自动备份最多保留数量（个），0为不限制",
         },
         "backup_last_success": {
             "name": "上次成功备份",
@@ -438,7 +438,7 @@
         },
         "backup_auto_max_count": {
             "name": "Backup limit",
-            "description": "Maximum number of backups to keep",
+            "description": "Maximum number of backups to keep (0 = unlimited)",
         },
         "backup_last_success": {
             "name": "Last successful backup",

app/common/display/result_display.py

@@ -714,6 +714,30 @@ def display_results_in_grid(result_grid, student_labels, alignment=None):
                 pass
             parent_widget.updateGeometry()
 
+    @staticmethod
+    def collect_grid_widgets(result_grid):
+        widgets = []
+        if not hasattr(result_grid, "count") or not hasattr(result_grid, "itemAt"):
+            return widgets
+        for i in range(result_grid.count()):
+            item = result_grid.itemAt(i)
+            if not item or not hasattr(item, "widget"):
+                continue
+            widget = item.widget()
+            if widget:
+                widgets.append(widget)
+        return widgets
+
+    @staticmethod
+    def dispose_widgets(widgets):
+        if not widgets:
+            return
+        for widget in widgets:
+            if widget:
+                widget.hide()
+                widget.setParent(None)
+                widget.deleteLater()
+
     @staticmethod
     def update_grid_labels(result_grid, new_labels, cached_labels):
         """
@@ -725,10 +749,12 @@ def update_grid_labels(result_grid, new_labels, cached_labels):
             cached_labels: 缓存的旧标签列表
         """
         if not new_labels:
-            return
+            return False
 
         count = result_grid.count()
         min_count = min(len(new_labels), len(cached_labels))
+        if min_count == 0:
+            return False
 
         for i in range(min_count):
             old_widget = cached_labels[i]
@@ -738,6 +764,12 @@ def update_grid_labels(result_grid, new_labels, cached_labels):
                 old_layout = old_widget.layout()
                 new_layout = new_widget.layout()
 
+                if not old_layout or not new_layout:
+                    return False
+
+                if old_layout.count() != new_layout.count():
+                    return False
+
                 if old_layout and new_layout:
                     for j in range(min(old_layout.count(), new_layout.count())):
                         old_item = old_layout.itemAt(j)
@@ -747,11 +779,17 @@ def update_grid_labels(result_grid, new_labels, cached_labels):
                             old_content = old_item.widget()
                             new_content = new_item.widget()
 
+                            if old_content is None or new_content is None:
+                                return False
+
                             # 如果内容是容器（带头像的情况），更新其内部组件
                             if old_content.layout() and new_content.layout():
                                 old_inner_layout = old_content.layout()
                                 new_inner_layout = new_content.layout()
 
+                                if old_inner_layout.count() != new_inner_layout.count():
+                                    return False
+
                                 for k in range(
                                     min(
                                         old_inner_layout.count(),
@@ -764,6 +802,11 @@ def update_grid_labels(result_grid, new_labels, cached_labels):
                                     if old_inner_item and new_inner_item:
                                         old_inner_widget = old_inner_item.widget()
                                         new_inner_widget = new_inner_item.widget()
+                                        if (
+                                            old_inner_widget is None
+                                            or new_inner_widget is None
+                                        ):
+                                            return False
 
                                         # 更新文本标签
                                         if isinstance(
@@ -788,15 +831,37 @@ def update_grid_labels(result_grid, new_labels, cached_labels):
                                             new_image = new_inner_widget.getImage()
                                             if old_image != new_image:
                                                 old_inner_widget.setImage(new_image)
+                                            if hasattr(
+                                                old_inner_widget, "setText"
+                                            ) and hasattr(new_inner_widget, "text"):
+                                                old_text = (
+                                                    old_inner_widget.text()
+                                                    if hasattr(old_inner_widget, "text")
+                                                    else ""
+                                                )
+                                                new_text = new_inner_widget.text()
+                                                if old_text != new_text:
+                                                    old_inner_widget.setText(new_text)
+                                        if not isinstance(
+                                            old_inner_widget, (BodyLabel, AvatarWidget)
+                                        ) or not isinstance(
+                                            new_inner_widget, (BodyLabel, AvatarWidget)
+                                        ):
+                                            return False
 
                             # 如果内容是直接标签（不带头像的情况）
                             elif isinstance(old_content, BodyLabel) and isinstance(
                                 new_content, BodyLabel
                             ):
                                 old_content.setText(new_content.text())
                                 old_content.setStyleSheet(new_content.styleSheet())
+                            else:
+                                return False
+            else:
+                return False
 
         cached_labels[:] = new_labels
+        return True
 
     @staticmethod
     def clear_grid(result_grid, log_debug=False):

app/common/lottery/lottery_manager.py

@@ -1005,7 +1005,19 @@ def display_result(widget, selected_students, pool_name):
         show_random=render_settings["show_random"],
         settings_group="lottery_settings",
     )
-    ResultDisplayUtils.display_results_in_grid(widget.result_grid, student_labels)
+    cached_widgets = ResultDisplayUtils.collect_grid_widgets(widget.result_grid)
+    if cached_widgets and len(cached_widgets) == len(student_labels):
+        updated = ResultDisplayUtils.update_grid_labels(
+            widget.result_grid, student_labels, cached_widgets
+        )
+        if updated:
+            ResultDisplayUtils.dispose_widgets(student_labels)
+        else:
+            ResultDisplayUtils.display_results_in_grid(
+                widget.result_grid, student_labels
+            )
+    else:
+        ResultDisplayUtils.display_results_in_grid(widget.result_grid, student_labels)
 
 
 def display_result_animated(widget, selected_students, pool_name):
@@ -1025,8 +1037,19 @@ def display_result_animated(widget, selected_students, pool_name):
         show_random=render_settings["show_random"],
         settings_group="lottery_settings",
     )
-
-    ResultDisplayUtils.display_results_in_grid(widget.result_grid, student_labels)
+    cached_widgets = ResultDisplayUtils.collect_grid_widgets(widget.result_grid)
+    if cached_widgets and len(cached_widgets) == len(student_labels):
+        updated = ResultDisplayUtils.update_grid_labels(
+            widget.result_grid, student_labels, cached_widgets
+        )
+        if updated:
+            ResultDisplayUtils.dispose_widgets(student_labels)
+        else:
+            ResultDisplayUtils.display_results_in_grid(
+                widget.result_grid, student_labels
+            )
+    else:
+        ResultDisplayUtils.display_results_in_grid(widget.result_grid, student_labels)
 
     settings = widget.manager.get_notification_settings(refresh=False)
     if settings is not None:

app/common/roll_call/roll_call_manager.py

@@ -1,4 +1,12 @@
-from PySide6.QtCore import QObject, Signal, QTimer, QEasingCurve, QFileSystemWatcher
+from PySide6.QtCore import (
+    QObject,
+    Signal,
+    QTimer,
+    QEasingCurve,
+    QFileSystemWatcher,
+    QThreadPool,
+    QRunnable,
+)
 from PySide6.QtGui import QFont
 from dataclasses import dataclass
 from loguru import logger
@@ -72,6 +80,9 @@ def __init__(self):
         self.current_group_index = 0
         self.current_gender_index = 0
         self.half_repeat = 0
+        self._precomputed_result = None
+        self._precompute_key = None
+        self._precompute_running = False
 
     def build_draw_context(
         self,
@@ -179,6 +190,9 @@ def load_data(
         加载学生数据
         """
         try:
+            self._precomputed_result = None
+            self._precompute_key = None
+            self._precompute_running = False
             self.current_class_name = class_name
             self.current_group_filter = group_filter
             self.current_gender_filter = gender_filter
@@ -252,6 +266,9 @@ def draw_final_students(self, count):
         """
         执行最终抽取
         """
+        precomputed = self.take_precomputed_result(count)
+        if precomputed:
+            return precomputed
         # 使用RollCallUtils中的核心抽取逻辑，它处理了去重、权重等复杂逻辑
         result = RollCallUtils.draw_random_students(
             self.current_class_name,
@@ -277,6 +294,91 @@ def save_result(self, selected_students, selected_students_dict):
             self.half_repeat,
         )
 
+    def _build_precompute_key(self, count):
+        try:
+            count = int(count or 0)
+        except Exception:
+            count = 0
+        return (
+            self.current_class_name,
+            self.current_group_filter,
+            self.current_gender_filter,
+            self.current_group_index,
+            self.current_gender_index,
+            self.half_repeat,
+            count,
+        )
+
+    def start_precompute_final(self, count):
+        try:
+            count = int(count or 0)
+        except Exception:
+            count = 0
+        if count <= 0 or not self.current_class_name:
+            return
+        key = self._build_precompute_key(count)
+        if self._precompute_running and self._precompute_key == key:
+            return
+        self._precompute_key = key
+        self._precomputed_result = None
+        self._precompute_running = True
+
+        class_name = self.current_class_name
+        group_index = self.current_group_index
+        group_filter = self.current_group_filter
+        gender_index = self.current_gender_index
+        gender_filter = self.current_gender_filter
+        half_repeat = self.half_repeat
+        draw_count = count
+
+        class _Signals(QObject):
+            loaded = Signal(object, object)
+
+        class _Loader(QRunnable):
+            def __init__(self, fn, signals, key):
+                super().__init__()
+                self.fn = fn
+                self.signals = signals
+                self.key = key
+
+            def run(self):
+                try:
+                    result = self.fn()
+                    self.signals.loaded.emit(self.key, result)
+                except Exception as e:
+                    logger.exception(f"预计算最终抽取结果失败: {e}")
+
+        def _collect():
+            return RollCallUtils.draw_random_students(
+                class_name,
+                group_index,
+                group_filter,
+                gender_index,
+                gender_filter,
+                draw_count,
+                half_repeat,
+            )
+
+        signals = _Signals()
+        signals.loaded.connect(self._on_precompute_loaded)
+        runnable = _Loader(_collect, signals, key)
+        QThreadPool.globalInstance().start(runnable)
+
+    def _on_precompute_loaded(self, key, result):
+        if key != self._precompute_key:
+            return
+        self._precomputed_result = result
+        self._precompute_running = False
+
+    def take_precomputed_result(self, count):
+        key = self._build_precompute_key(count)
+        if self._precomputed_result and self._precompute_key == key:
+            result = self._precomputed_result
+            self._precomputed_result = None
+            self._precompute_running = False
+            return result
+        return None
+
     def reset_records(self):
         """重置抽取记录"""
         remove_record(
@@ -321,6 +423,8 @@ def start_roll_call_draw(widget):
     autoplay_count = plan.autoplay_count if plan else 0
     animation_interval = plan.animation_interval if plan else 0
     animation_music = plan.animation_music if plan else None
+    if animation in [0, 1]:
+        manager.start_precompute_final(widget.current_count)
 
     if animation == 0:
         if animation_music:
@@ -527,12 +631,18 @@ def play_voice_result(widget):
             "basic_voice_settings", "edge_tts_voice_name"
         )
 
+        class_name = (
+            widget.final_class_name
+            if hasattr(widget, "final_class_name") and widget.final_class_name
+            else widget.list_combobox.currentText()
+        )
+
         widget.tts_handler.voice_play(
             config=voice_settings,
             student_names=student_names,
             engine_type=engine_type,
             voice_name=edge_tts_voice_name,
-            class_name=widget.list_combobox.currentText(),
+            class_name=class_name,
         )
     except Exception as e:
         logger.exception(f"播放语音失败: {e}", exc_info=True)
@@ -584,7 +694,19 @@ def display_result_animated(widget, selected_students, class_name):
         settings_group="roll_call_settings",
     )
 
-    ResultDisplayUtils.display_results_in_grid(widget.result_grid, student_labels)
+    cached_widgets = ResultDisplayUtils.collect_grid_widgets(widget.result_grid)
+    if cached_widgets and len(cached_widgets) == len(student_labels):
+        updated = ResultDisplayUtils.update_grid_labels(
+            widget.result_grid, student_labels, cached_widgets
+        )
+        if updated:
+            ResultDisplayUtils.dispose_widgets(student_labels)
+        else:
+            ResultDisplayUtils.display_results_in_grid(
+                widget.result_grid, student_labels
+            )
+    else:
+        ResultDisplayUtils.display_results_in_grid(widget.result_grid, student_labels)
 
     RollCallUtils.show_notification_if_enabled(
         class_name=class_name,