浮窗和验证窗口的修复和优化

- 优化 **浮窗点击识别**，减少误识别为拖动
- 修复 **验证窗口线程**，修复线程未清理导致的崩溃
- 修复 **托盘关于功能**，修复绕过安全验证问题
- 修复 **收纳浮窗无焦点**，修复无焦点模式未生效

Author: lzy98276

CHANGELOG/v2.2.0/CHANGELOG.md

@@ -7,6 +7,7 @@ v2.0 - Koharu（小鸟游星野） release 3
 
 ## 💡 功能优化
 
+- 优化 **浮窗点击识别**，减少误识别为拖动
 - 优化 **安全验证逻辑**，统一使用项目验证系统
 - 优化 **软件退出**，解决退出缓慢问题
 - 优化 **URL 注册**，无需管理员权限即可完成
@@ -16,8 +17,11 @@ v2.0 - Koharu（小鸟游星野） release 3
 ## 🐛 修复问题
 
 - 修复 **URL命令解析**，修复命令匹配错误
+- 修复 **验证窗口线程**，修复线程未清理导致的崩溃
+- 修复 **托盘关于功能**，修复绕过安全验证问题
 - 修复 **重启功能**，解决无法重启异常
 - 修复 **URL 注册**，修复注册失败问题
+- 修复 **收纳浮窗无焦点**，修复无焦点模式未生效
 
 ## 🔧 其它变更
 

app/common/IPC_URL/url_command_handler.py

@@ -313,7 +313,12 @@ def _request_verification(
 
         def execute_command():
             """验证通过后执行命令"""
-            return self._execute_command(command, params)
+            try:
+                result = self._execute_command(command, params)
+                logger.debug(f"验证后执行命令完成: {command}, 结果: {result}")
+                return result
+            except Exception as e:
+                logger.error(f"验证后执行命令失败: {command}, 错误: {e}")
 
         # 调用验证窗口
         create_verify_password_window(on_verified=execute_command, operation_type=op)

app/core/window_manager.py

@@ -232,11 +232,35 @@ def _recreate_settings_window(self) -> None:
 
     def show_settings_window_about(self) -> None:
         """显示关于窗口"""
-        if self.settings_window is None:
-            self.create_settings_window()
+        from app.common.safety.verify_ops import (
+            should_require_password,
+            require_and_run,
+        )
 
-        if self.settings_window is not None:
-            self.settings_window.show_settings_window_about()
+        def on_verified() -> None:
+            """验证通过后，正常打开关于窗口"""
+            if self.settings_window is None:
+                self.create_settings_window()
+
+            if self.settings_window is not None:
+                self.show_settings_window("aboutInterface", is_preview=False)
+
+        def on_preview() -> None:
+            """点击预览按钮后，以预览模式打开关于窗口"""
+            if self.settings_window is None:
+                self.create_settings_window()
+
+            if self.settings_window is not None:
+                self.show_settings_window("aboutInterface", is_preview=True)
+
+        if should_require_password("open_settings"):
+            logger.debug("打开关于窗口需要验证")
+            require_and_run(
+                "open_settings", self.main_window, on_verified, on_preview=on_preview
+            )
+        else:
+            logger.debug("打开关于窗口无需验证")
+            on_verified()
 
     def create_float_window(self) -> None:
         """创建浮窗实例"""

app/view/another_window/security/verify_password.py

@@ -585,14 +585,14 @@ def __cancel(self):
                 self.usb_poll_timer.stop()
             if hasattr(self, "_usb_thread"):
                 try:
-                    self._usb_thread.quit()
-                    self._usb_thread.wait(300)
+                    self._usb_thread.terminate()
+                    self._usb_thread.wait(500)
                 except Exception:
                     pass
             if hasattr(self, "_verify_thread"):
                 try:
-                    self._verify_thread.quit()
-                    self._verify_thread.wait(300)
+                    self._verify_thread.terminate()
+                    self._verify_thread.wait(500)
                 except Exception:
                     pass
         except Exception:
@@ -602,3 +602,8 @@ def __cancel(self):
                 parent.close()
                 break
             parent = parent.parent()
+
+    def closeEvent(self, event):
+        """窗口关闭时清理线程"""
+        self.__cancel()
+        super().closeEvent(event)

app/view/floating_window/levitation.py

@@ -46,8 +46,8 @@ class LevitationWindow(QWidget):
     DEFAULT_ICON_SIZE = QSize(24, 24)  # 图标大小
     DEFAULT_SPACING = 6
     DEFAULT_MARGINS = 6  # 贴边隐藏时的最小间距
-    DRAG_THRESHOLD = 8  # 拖拽触发阈值，增加阈值避免误识别按钮点击为拖动
-    MIN_DRAG_TIME = 50  # 最小拖动识别时间（毫秒），避免极短时间内的移动被识别为拖动
+    DRAG_THRESHOLD = 12  # 拖拽触发阈值，增加阈值避免误识别按钮点击为拖动
+    MIN_DRAG_TIME = 100  # 最小拖动识别时间（毫秒），避免极短时间内的移动被识别为拖动
 
     def __init__(self, parent=None):
         """初始化悬浮窗窗口"""
@@ -1435,9 +1435,12 @@ def _create_arrow_button(self, direction, x, y):
             Qt.FramelessWindowHint
             | Qt.WindowStaysOnTopHint
             | Qt.Tool
-            | Qt.NoFocus
             | Qt.NoDropShadowWindowHint
         )
+        if self._do_not_steal_focus:
+            self.arrow_widget.setWindowFlags(
+                self.arrow_widget.windowFlags() | Qt.WindowDoesNotAcceptFocus
+            )
 
         # 设置容器透明
         self.arrow_widget.setAttribute(Qt.WA_TranslucentBackground)