Переглянути джерело

add background only and fix bug

Rain1231244 1 рік тому
батько
коміт
ea89c2a37d
3 змінених файлів з 56 додано та 7 видалено
  1. 41 7
      module/device/platform2/platform_windows.py
  2. 12 0
      script.py
  3. 3 0
      tasks/Script/config_device.py

+ 41 - 7
module/device/platform2/platform_windows.py

@@ -35,16 +35,45 @@ def minimize_by_name(window_name, convert_hidden=True):
             if is_visible:
             if is_visible:
                 # 可见窗口 → 最小化
                 # 可见窗口 → 最小化
                 minimize_window(hwnd)
                 minimize_window(hwnd)
-                print(f'最小化可见窗口: {title}')
+                logger.info(f'最小化可见窗口: {title}')
             elif convert_hidden:
             elif convert_hidden:
                 # 隐藏窗口 → 改为最小化不激活
                 # 隐藏窗口 → 改为最小化不激活
                 ctypes.windll.user32.ShowWindow(hwnd, 6)  # SW_SHOWMINNOACTIVE
                 ctypes.windll.user32.ShowWindow(hwnd, 6)  # SW_SHOWMINNOACTIVE
-                print(f'隐藏窗口改为最小化: {title}')
+                logger.info(f'隐藏窗口改为最小化: {title}')
         return True
         return True
     
     
     WNDENUMPROC = ctypes.WINFUNCTYPE(ctypes.c_bool, wintypes.HWND, ctypes.POINTER(ctypes.c_int))
     WNDENUMPROC = ctypes.WINFUNCTYPE(ctypes.c_bool, wintypes.HWND, ctypes.POINTER(ctypes.c_int))
     ctypes.windll.user32.EnumWindows(WNDENUMPROC(callback), None)
     ctypes.windll.user32.EnumWindows(WNDENUMPROC(callback), None)
 
 
+def find_hwnd_by_name(window_name):
+    """
+    枚举所有窗口,返回第一个匹配名称的 hwnd
+    """
+    target = None
+    def callback(hwnd, lParam):
+        title = get_window_title(hwnd)
+        if window_name.lower() in title.lower():
+            nonlocal target
+            target = hwnd
+            return False  # 停止枚举
+        return True
+
+    WNDENUMPROC = ctypes.WINFUNCTYPE(ctypes.c_bool, wintypes.HWND, ctypes.POINTER(ctypes.c_int))
+    ctypes.windll.user32.EnumWindows(WNDENUMPROC(callback), None)
+    return target
+def show_window_by_name(window_name):
+    """
+    显示指定名称的窗口
+    Args:
+        window_name (str): 窗口名称(支持部分匹配)
+    """
+    hwnd = find_hwnd_by_name(window_name)
+    if hwnd:
+        ctypes.windll.user32.ShowWindow(hwnd, 5)  # SW_SHOW
+        set_focus_window(hwnd)
+        logger.info(f'显示窗口: {window_name}')
+    else:
+        logger.info(f'没有找到窗口: {window_name}')
 
 
 def get_focused_window():
 def get_focused_window():
     return ctypes.windll.user32.GetForegroundWindow()
     return ctypes.windll.user32.GetForegroundWindow()
@@ -139,7 +168,7 @@ class PlatformWindows(PlatformBase, EmulatorManager):
         """
         """
         Start a emulator without error handling
         Start a emulator without error handling
         """
         """
-        show_window=not self.config.script.device.emulator_window_minimize
+        show_window=not self.config.script.device.emulator_window_minimize and not self.config.script.device.run_background_only
         exe: str = instance.emulator.path
         exe: str = instance.emulator.path
         if instance == Emulator.MuMuPlayer:
         if instance == Emulator.MuMuPlayer:
             # NemuPlayer.exe
             # NemuPlayer.exe
@@ -307,7 +336,7 @@ class PlatformWindows(PlatformBase, EmulatorManager):
             # logger.info([get_focused_window(), get_window_title(get_focused_window())])
             # logger.info([get_focused_window(), get_window_title(get_focused_window())])
             if current_window != 0 and new_window == 0:
             if current_window != 0 and new_window == 0:
                 new_window = get_focused_window()
                 new_window = get_focused_window()
-                if current_window != new_window:
+                if current_window != new_window and not self.config.script.device.emulator_window_minimize and not self.config.script.device.run_background_only:
                     logger.info(f'New window showing up: {new_window}, focus back')
                     logger.info(f'New window showing up: {new_window}, focus back')
                     set_focus_window(current_window)
                     set_focus_window(current_window)
                 else:
                 else:
@@ -361,10 +390,15 @@ class PlatformWindows(PlatformBase, EmulatorManager):
             break
             break
 
 
         emulator_window_minimize = self.config.script.device.emulator_window_minimize
         emulator_window_minimize = self.config.script.device.emulator_window_minimize
-        logger.info(f'Minimize new emulator window: {emulator_window_minimize}')
-        
-        if emulator_window_minimize:
+        if (emulator_window_minimize): logger.info(f'Minimize new emulator window: {emulator_window_minimize}')
+        if (self.config.script.device.run_background_only):
+            logger.info(f'run background only: {self.config.script.device.run_background_only}')
+            logger.warning('run_background_only will not show any UI, emulator will run background only')
+        if emulator_window_minimize and not self.config.script.device.run_background_only:
             # 直接使用窗口名称最小化
             # 直接使用窗口名称最小化
+            sleep_time = 3
+            logger.info(f'Waiting {sleep_time} seconds before minimizing window')
+            Timer(sleep_time).wait()
             target_window_name = self.config.script.device.handle  # 在这里输入你的具体窗口名称
             target_window_name = self.config.script.device.handle  # 在这里输入你的具体窗口名称
             minimize_by_name(target_window_name)
             minimize_by_name(target_window_name)
             logger.info(f'最小化窗口: {target_window_name}')
             logger.info(f'最小化窗口: {target_window_name}')

+ 12 - 0
script.py

@@ -33,6 +33,9 @@ from module.logger import logger
 from module.exception import *
 from module.exception import *
 from module.server.i18n import I18n
 from module.server.i18n import I18n
 
 
+from module.device.platform2.platform_windows import minimize_by_name,show_window_by_name
+
+
 class Script:
 class Script:
     def __init__(self, config_name: str ='oas') -> None:
     def __init__(self, config_name: str ='oas') -> None:
         logger.hr('Start', level=0)
         logger.hr('Start', level=0)
@@ -405,6 +408,15 @@ class Script:
         logger.set_file_logger(self.config_name)
         logger.set_file_logger(self.config_name)
         logger.info(f'Start scheduler loop: {self.config_name}')
         logger.info(f'Start scheduler loop: {self.config_name}')
 
 
+        # Update GUI 防呆, 读取设置并立刻显示后台模拟器到前台
+        if not self.config.script.device.run_background_only:
+            target_window_name = self.config.script.device.handle  # 在这里输入你的具体窗口名称
+            if self.config.script.device.emulator_window_minimize:
+                minimize_by_name(target_window_name)
+                logger.info(f'重新显示: {target_window_name}')
+            else:
+                show_window_by_name(target_window_name)
+                
         while 1:
         while 1:
             # Check update event from GUI
             # Check update event from GUI
             # if self.stop_event is not None:
             # if self.stop_event is not None:

+ 3 - 0
tasks/Script/config_device.py

@@ -73,6 +73,9 @@ class Device(BaseModel):
     # 模拟器启动后最小化
     # 模拟器启动后最小化
     emulator_window_minimize: bool = Field(default=False,
     emulator_window_minimize: bool = Field(default=False,
                                              description='emulator_window_minimize_help')
                                              description='emulator_window_minimize_help')
+    # 启动时纯后台运行模拟器,不显示窗口和任务栏
+    run_background_only: bool = Field(default=False,
+                                             description='run_background_only_help')