完善UIA置顶_进行打包

Author: lzy98276

CHANGELOG/v2.3.0-beta.1/CHANGELOG.md

@@ -10,11 +10,12 @@ v2.3 - Shirako (砂狼白子) beta 1
 ## 💡 功能优化
 
 - 优化 **UIA置顶**，统一封装DLL调用
-- 优化 **UIA置顶**，切换后询问重启
+- 优化 **UIA置顶**，切换后支持提权重启
+- 优化 **UIA置顶**，提权后主界面显示再重启
 
 ## 🐛 修复问题
 
-- 无
+- 修复 **UIA置顶**，提权后连重导致退出
 
 ## 🔧 其它变更
 

app/Language/modules/sidebar_tray_management.py

@@ -35,7 +35,7 @@
             "description": "UIA置顶切换后重启按钮文本",
         },
         "uia_topmost_restart_dialog_cancel_btn": {
-            "name": "稍后",
+            "name": "取消",
             "description": "UIA置顶切换后取消按钮文本",
         },
         "reset_floating_window_position_button": {
@@ -147,7 +147,7 @@
             "description": "Restart button text after switching UIA topmost",
         },
         "uia_topmost_restart_dialog_cancel_btn": {
-            "name": "Later",
+            "name": "Cancel",
             "description": "Cancel button text after switching UIA topmost",
         },
         "reset_floating_window_position_button": {

app/common/windows/uiaccess.py

@@ -21,7 +21,7 @@ class _DummyWinTypes:
         HWND = int
         LPCWSTR = str
         UINT = int
-        
+
     wintypes = _DummyWinTypes()
 
 from app.tools.path_utils import get_data_path
@@ -31,6 +31,8 @@ class _DummyWinTypes:
 _kernel32 = None
 
 UIACCESS_RESTART_ENV = "SECRANDOM_RESTART_UIACCESS"
+ELEVATE_RESTART_ENV = "SECRANDOM_RESTART_ELEVATED"
+UIACCESS_RESTART_ARG = "--secrandom-uiaccess"
 
 
 def _is_windows() -> bool:
@@ -198,3 +200,35 @@ def set_window_band_uiaccess(hwnd: int) -> bool:
         return bool(user32.SetWindowPos(h, hwnd_topmost, 0, 0, 0, 0, flags))
     except Exception:
         return False
+
+
+def start_elevated_process(cmd_list: list[str], cwd: str | None = None) -> bool:
+    if not _is_windows():
+        return False
+    if not cmd_list:
+        return False
+    executable = str(cmd_list[0] or "").strip()
+    if not executable:
+        return False
+
+    params = list2cmdline(list(cmd_list[1:])) if len(cmd_list) > 1 else ""
+    directory = str(cwd) if cwd else None
+    try:
+        shell32 = ctypes.windll.shell32
+        shell32.ShellExecuteW.argtypes = [
+            wintypes.HWND,
+            wintypes.LPCWSTR,
+            wintypes.LPCWSTR,
+            wintypes.LPCWSTR,
+            wintypes.LPCWSTR,
+            ctypes.c_int,
+        ]
+        shell32.ShellExecuteW.restype = wintypes.HINSTANCE
+        rc = int(shell32.ShellExecuteW(None, "runas", executable, params, directory, 1))
+        if rc <= 32:
+            logger.debug("请求管理员启动失败: rc={}", rc)
+            return False
+        return True
+    except Exception as e:
+        logger.debug("请求管理员启动异常: {}", e)
+        return False

app/core/window_manager.py

@@ -1,3 +1,4 @@
+import os
 from typing import Optional, Callable, TYPE_CHECKING
 from loguru import logger
 from PySide6.QtCore import QTimer
@@ -9,6 +10,8 @@
 
 
 app_start_time: float = 0.0
+pending_uiaccess_restart_after_show: bool = False
+_pending_uiaccess_restart_consumed: bool = False
 
 
 class WindowManager:
@@ -160,16 +163,62 @@ def _configure_main_window_display(self) -> None:
             if is_maximized:
                 from app.tools.variable import APP_INIT_DELAY
 
-                QTimer.singleShot(APP_INIT_DELAY, self.main_window.showMaximized)
+                def show_main_window():
+                    try:
+                        self.main_window.showMaximized()
+                    finally:
+                        self._schedule_main_window_shown_tasks()
+
+                QTimer.singleShot(APP_INIT_DELAY, show_main_window)
             else:
                 self.main_window.show()
+                self._schedule_main_window_shown_tasks()
 
         startup_display_float = readme_settings_async(
             "floating_window_management", "startup_display_floating_window"
         )
         if startup_display_float:
             self.show_float_window()
 
+    def _schedule_main_window_shown_tasks(self) -> None:
+        try:
+            QTimer.singleShot(0, self._handle_main_window_shown)
+        except Exception:
+            pass
+
+    def _handle_main_window_shown(self) -> None:
+        global pending_uiaccess_restart_after_show
+        global _pending_uiaccess_restart_consumed
+
+        if not bool(pending_uiaccess_restart_after_show):
+            return
+        if bool(_pending_uiaccess_restart_consumed):
+            return
+        _pending_uiaccess_restart_consumed = True
+
+        try:
+            import platform
+
+            if platform.system() != "Windows":
+                return
+        except Exception:
+            return
+
+        try:
+            from PySide6.QtWidgets import QApplication
+            from app.tools.variable import EXIT_CODE_RESTART
+            from app.common.windows.uiaccess import (
+                UIACCESS_RESTART_ENV,
+                is_uiaccess_process,
+            )
+
+            if bool(is_uiaccess_process()):
+                return
+            os.environ[str(UIACCESS_RESTART_ENV)] = "1"
+            QApplication.exit(EXIT_CODE_RESTART)
+        except Exception as e:
+            logger.debug("主窗口显示后触发 UIAccess 重启失败（已忽略）: {}", e)
+
     def _connect_url_handler_signals(self) -> None:
         """连接URL处理器信号"""
         if not self.url_handler:

app/view/floating_window/levitation.py

@@ -187,6 +187,13 @@ def _request_uiaccess_restart(self):
                 os.environ[str(env_key)] = "1"
             except Exception:
                 pass
+        try:
+            if not bool(self._is_admin()):
+                from app.common.windows.uiaccess import ELEVATE_RESTART_ENV
+
+                os.environ[str(ELEVATE_RESTART_ENV)] = "1"
+        except Exception:
+            pass
 
         app = QApplication.instance()
         if app is not None:
@@ -471,11 +478,6 @@ def _init_settings(self):
         self._topmost_mode = self._get_int_setting(
             "floating_window_management", "floating_window_topmost_mode", 1
         )
-        if self._topmost_mode == 2 and not self._is_admin():
-            self._topmost_mode = 1
-            update_settings(
-                "floating_window_management", "floating_window_topmost_mode", 1
-            )
         self._refresh_window_flags()
 
         # 贴边隐藏功能配置
@@ -1791,14 +1793,6 @@ def _on_setting_changed(self, first, second, value):
                 self.setWindowOpacity(self._opacity)
             elif second == "floating_window_topmost_mode":
                 mode = int(value or 0)
-                if mode == 2 and not self._is_admin():
-                    self._topmost_mode = 1
-                    update_settings(
-                        "floating_window_management", "floating_window_topmost_mode", 1
-                    )
-                    self._refresh_window_flags()
-                    self._apply_topmost_runtime()
-                    return
                 self._topmost_mode = mode
                 self._refresh_window_flags()
                 self._apply_topmost_runtime()

app/view/settings/floating_window_management.py

@@ -2,6 +2,9 @@
 # 导入库
 # ==================================================
 
+import os
+import ctypes
+
 from PySide6.QtWidgets import *
 from PySide6.QtGui import *
 from PySide6.QtCore import *
@@ -315,11 +318,25 @@ def floating_window_topmost_mode_combo_box_changed(self, index):
                     "uia_topmost_restart_dialog_cancel_btn",
                 )
             )
-
             if dialog.exec():
                 update_settings(
                     "floating_window_management", "floating_window_topmost_mode", index
                 )
+                try:
+                    from app.common.windows.uiaccess import (
+                        ELEVATE_RESTART_ENV,
+                        UIACCESS_RESTART_ENV,
+                    )
+
+                    os.environ[str(UIACCESS_RESTART_ENV)] = "1"
+                    try:
+                        is_admin = bool(ctypes.windll.shell32.IsUserAnAdmin())
+                    except Exception:
+                        is_admin = False
+                    if not is_admin:
+                        os.environ[str(ELEVATE_RESTART_ENV)] = "1"
+                except Exception:
+                    pass
                 QApplication.exit(EXIT_CODE_RESTART)
             else:
                 blocker = QSignalBlocker(self.floating_window_topmost_mode_combo_box)

main.py

@@ -360,14 +360,33 @@ def restart_application(program_dir):
         if platform.system() == "Windows":
             try:
                 from app.common.windows.uiaccess import (
+                    ELEVATE_RESTART_ENV,
                     UIACCESS_RESTART_ENV,
+                    UIACCESS_RESTART_ARG,
+                    start_elevated_process,
                     start_uiaccess_process,
                 )
 
                 need_uiaccess = bool(os.environ.pop(UIACCESS_RESTART_ENV, "") == "1")
+                need_elevated = bool(os.environ.pop(ELEVATE_RESTART_ENV, "") == "1")
             except Exception:
                 need_uiaccess = False
+                need_elevated = False
                 start_uiaccess_process = None
+                start_elevated_process = None
+                UIACCESS_RESTART_ARG = None
+
+            if need_elevated and start_elevated_process is not None:
+                cmd = [executable] + filtered_args
+                if need_uiaccess and UIACCESS_RESTART_ARG:
+                    cmd.append(str(UIACCESS_RESTART_ARG))
+                try:
+                    time.sleep(max(0.8, float(PROCESS_EXIT_WAIT_SECONDS or 0)))
+                except Exception:
+                    time.sleep(0.8)
+                if bool(start_elevated_process(cmd, cwd=program_dir)):
+                    logger.info("Windows 平台：已请求管理员启动新进程")
+                    os._exit(0)
 
             if need_uiaccess and start_uiaccess_process is not None:
                 cmd = [executable] + filtered_args
@@ -457,6 +476,28 @@ def handle_exit(
 
 def main():
     """主程序入口"""
+    try:
+        if platform.system() == "Windows":
+            from app.common.windows.uiaccess import (
+                UIACCESS_RESTART_ARG,
+                is_uiaccess_process,
+            )
+
+            if UIACCESS_RESTART_ARG in sys.argv:
+                try:
+                    while UIACCESS_RESTART_ARG in sys.argv:
+                        sys.argv.remove(UIACCESS_RESTART_ARG)
+                except Exception:
+                    pass
+
+                if not bool(is_uiaccess_process()):
+                    try:
+                        wm.pending_uiaccess_restart_after_show = True
+                    except Exception:
+                        pass
+    except Exception:
+        pass
+
     program_dir, shared_memory, is_first_instance = initialize_application()
 
     if not is_first_instance: