语音播报功能优化

Author: lzy98276

app/common/voice/voice.py

@@ -252,6 +252,9 @@ def stop(self) -> None:
         if self._play_thread and self._play_thread.is_alive():
             self._play_thread.join(timeout=5.0)  # 添加超时保护
         self._clear_queue()
+        # 重置线程状态，允许下次调用start()重新启动
+        self._play_thread = None
+        self._stop_flag.clear()
 
     def _clear_queue(self) -> None:
         """清空播放队列"""
@@ -656,12 +659,17 @@ def voice_play(
             if not student_names:
                 return
 
+            # 停止之前的播放，清空队列
+            self.stop()
+            # 重新启动播放线程
+            self.playback_system.start()
+
             # 读取音频设置文件
             audio_settings = {}
             if class_name:
                 audio_file = get_audio_path(f"{class_name}.json")
                 if audio_file.exists():
-                    with open(audio_file, "r", encoding="utf-8") as f:
+                    with open(str(audio_file), "r", encoding="utf-8") as f:
                         audio_settings = json.load(f)
 
             # 应用TTS别名、前缀和后缀
@@ -711,6 +719,9 @@ def _handle_system_tts(
     ) -> None:
         """系统TTS处理"""
         with self.system_tts_lock:
+            if self.voice_engine is None:
+                logger.error("系统TTS引擎未初始化，无法播放语音")
+                return
             for name in student_names:
                 try:
                     self.voice_engine.say(f"{name}")
@@ -758,8 +769,8 @@ def _prepare_and_play(
         self, student_names: List[str], config: Dict[str, Any], voice_name: str
     ) -> None:
         """准备并播放语音"""
-        # 设置播放音量
-        self.playback_system.set_volume(config["voice_volume"])
+        # 设置播放音量，转换为0.0-1.0范围
+        self.playback_system.set_volume(config["voice_volume"] / 100.0)
         # 设置播放语速
         self.playback_system.set_speed(config["voice_speed"])
 
@@ -782,3 +793,11 @@ def stop(self) -> None:
         线程池将在对象销毁时自动关闭
         """
         self.playback_system.stop()
+
+        # 系统TTS引擎也需要停止
+        with self.system_tts_lock:
+            if self.voice_engine is not None:
+                try:
+                    self.voice_engine.stop()
+                except Exception as e:
+                    logger.error(f"停止系统TTS引擎失败: {e}")

app/tools/config.py

@@ -391,13 +391,14 @@ def show_notification(
         raise ValueError(f"不支持的通知类型: {notification_type}")
 
 
-def send_system_notification(title: str, content: str) -> bool:
+def send_system_notification(title: str, content: str, url: str = None) -> bool:
     """
     发送系统通知
 
     Args:
         title: 通知标题
         content: 通知内容
+        url: 点击通知后跳转的URL，默认为下载链接
 
     Returns:
         bool: 通知发送是否成功
@@ -406,6 +407,20 @@ def send_system_notification(title: str, content: str) -> bool:
         # 获取软件图标路径
         icon_path = str(get_data_path("assets", "icon/secrandom-icon-paper.ico"))
 
+        # 定义点击通知的回调函数
+        def on_notification_click():
+            """点击通知时执行的函数"""
+            try:
+                if url:
+                    import webbrowser
+
+                    webbrowser.open(url)
+                    logger.debug(f"已打开通知链接: {url}")
+                else:
+                    logger.warning("通知未配置URL，无法打开链接")
+            except Exception as e:
+                logger.error(f"打开通知链接失败: {e}")
+
         if sys.platform == "win32":
             # Windows平台
             try:
@@ -414,7 +429,12 @@ def send_system_notification(title: str, content: str) -> bool:
 
                 toaster = ToastNotifier()
                 toaster.show_toast(
-                    title, content, icon_path=icon_path, duration=15, threaded=True
+                    title,
+                    content,
+                    icon_path=icon_path,
+                    duration=0,
+                    threaded=True,
+                    callback_on_click=on_notification_click,
                 )
                 logger.debug(f"已发送Windows通知: {title}")
                 return True
@@ -428,7 +448,7 @@ def send_system_notification(title: str, content: str) -> bool:
                         message=content,
                         app_name=APPLY_NAME,
                         app_icon=icon_path,
-                        timeout=15,
+                        timeout=0,
                     )
                     logger.debug(f"已发送Windows通知(使用plyer): {title}")
                     return True
@@ -441,12 +461,28 @@ def send_system_notification(title: str, content: str) -> bool:
                 # 尝试使用notify-send命令
                 import subprocess
 
-                subprocess.run(
-                    ["notify-send", "--icon", icon_path, title, content],
-                    check=True,
-                    timeout=5,
-                )
-                logger.debug(f"已发送Linux通知: {title}")
+                if url:
+                    subprocess.run(
+                        [
+                            "notify-send",
+                            "--icon",
+                            icon_path,
+                            "--action",
+                            f"default={url}",
+                            title,
+                            content,
+                        ],
+                        check=True,
+                        timeout=0,
+                    )
+                    logger.debug(f"已发送Linux通知(包含URL): {title}")
+                else:
+                    subprocess.run(
+                        ["notify-send", "--icon", icon_path, title, content],
+                        check=True,
+                        timeout=0,
+                    )
+                    logger.debug(f"已发送Linux通知(不包含URL): {title}")
                 return True
             except subprocess.CalledProcessError as e:
                 # 如果notify-send不可用，尝试使用plyer
@@ -458,7 +494,7 @@ def send_system_notification(title: str, content: str) -> bool:
                         message=content,
                         app_name=APPLY_NAME,
                         app_icon=icon_path,
-                        timeout=15,
+                        timeout=0,
                     )
                     logger.debug(f"已发送Linux通知(使用plyer): {title}")
                     return True

main.py

@@ -447,7 +447,9 @@ def run(self):
                     content = get_content_name_async(
                         "update", "update_notification_content"
                     ).format(version=latest_version)
-                    send_system_notification(title, content)
+                    send_system_notification(
+                        title, content, url="https://secrandom.netlify.app/download"
+                    )
 
                     # 如果是模式2或3，自动下载更新
                     if auto_update_mode in [2, 3]: