Parcourir la source

feat(DesktopClient): 设备层接入桌面模式(免 adb、无模拟器生命周期)

- connection:跳过 detect_device(包名取配置),方向恒为 0,不走 adb dumpsys
- screenshot:桌面模式放宽截图间隔;分支判断前移到夹取之前,避免按错误区间改写用户配置
- adb:swipe_adb 改走窗口消息
- platform_windows:emulator_stop 改关客户端
- app_control:app_is_alive / app_is_running 改判窗口存在性(pidof 在桌面模式必然失败)
User il y a 1 mois
Parent
commit
cafe832b50

+ 3 - 0
module/device/app_control.py

@@ -12,6 +12,9 @@ class AppControl(Adb, Uiautomator2):
     _app_u2_family = ['uiautomator2', 'minitouch', 'scrcpy']
     _app_u2_family = ['uiautomator2', 'minitouch', 'scrcpy']
 
 
     def app_is_running(self) -> bool:
     def app_is_running(self) -> bool:
+        # 桌面模式:窗口存在 且 已完成登录(自动启动的客户端停在登录页,需先走登录流程)
+        if self.is_desktop:
+            return self.desktop_window_exists() and getattr(self, '_desktop_login_done', True)
         method = self.config.script.device.control_method
         method = self.config.script.device.control_method
         # if self.is_wsa:
         # if self.is_wsa:
         #     package = self.app_current_wsa()
         #     package = self.app_current_wsa()

+ 9 - 0
module/device/connection.py

@@ -95,6 +95,11 @@ class Connection(ConnectionAttr):
             config (AzurLaneConfig, str): Name of the user config under ./config
             config (AzurLaneConfig, str): Name of the user config under ./config
         """
         """
         super().__init__(config)
         super().__init__(config)
+        # 桌面客户端模式:不经过 adb 设备/包检测,包名直接用配置值
+        if self.is_desktop:
+            self.package = self.config.script.device.package_name.value
+            logger.attr('PackageName', self.package)
+            return
         if not self.is_over_http:
         if not self.is_over_http:
             self.detect_device()
             self.detect_device()
 
 
@@ -691,6 +696,10 @@ class Connection(ConnectionAttr):
                 2: 'HOME key on the top'
                 2: 'HOME key on the top'
                 3: 'HOME key on the left'
                 3: 'HOME key on the left'
         """
         """
+        # 桌面模式:窗口即横屏,方向恒为 0(Normal),不经过 adb dumpsys
+        if self.is_desktop:
+            self.orientation = 0
+            return 0
         _DISPLAY_RE = re.compile(
         _DISPLAY_RE = re.compile(
             r'.*DisplayViewport{.*valid=true, .*orientation=(?P<orientation>\d+), .*deviceWidth=(?P<width>\d+), deviceHeight=(?P<height>\d+).*'
             r'.*DisplayViewport{.*valid=true, .*orientation=(?P<orientation>\d+), .*deviceWidth=(?P<width>\d+), deviceHeight=(?P<height>\d+).*'
         )
         )

+ 3 - 0
module/device/method/adb.py

@@ -192,6 +192,9 @@ class Adb(Connection):
 
 
     @retry
     @retry
     def swipe_adb(self, p1, p2, duration=0.1):
     def swipe_adb(self, p1, p2, duration=0.1):
+        # 桌面客户端模式没有 adb 设备,滑动改走窗口消息路径(不影响模拟器流程)
+        if getattr(self, 'is_desktop', False):
+            return self.swipe_window_message(p1, p2)
         duration = int(duration * 1000)
         duration = int(duration * 1000)
         self.adb_shell(['input', 'swipe', *p1, *p2, duration])
         self.adb_shell(['input', 'swipe', *p1, *p2, duration])
 
 

+ 4 - 0
module/device/platform2/platform_windows.py

@@ -446,6 +446,10 @@ class PlatformWindows(PlatformBase, EmulatorManager):
         return False
         return False
 
 
     def emulator_stop(self):
     def emulator_stop(self):
+        # 桌面客户端无模拟器生命周期,空闲关闭改走关闭客户端。
+        # desktop_stop_client 内部已做「窗口消失 且 进程退出」验证并多轮重杀,直接用其结论
+        if getattr(self, 'is_desktop', False):
+            return self.desktop_stop_client()
         logger.hr('Emulator stop', level=1)
         logger.hr('Emulator stop', level=1)
         for _ in range(3):
         for _ in range(3):
             # Stop
             # Stop

+ 14 - 5
module/device/screenshot.py

@@ -157,16 +157,25 @@ class Screenshot(Adb, DroidCast, Scrcpy, Window, NemuIpc):
         """
         """
         if interval is None:
         if interval is None:
             origin = self.config.script.optimization.screenshot_interval
             origin = self.config.script.optimization.screenshot_interval
-            interval = limit_in(origin, 0.1, 0.3)
+            # 分支判断放在夹取之前:写回发生在各自的 clamp 之后,先夹取会按错误的
+            # 区间改写用户配置。桌面模式 BitBlt 单帧约 5ms,允许更小间隔
+            if getattr(self, 'is_desktop', False):
+                interval = limit_in(origin, 0.05, 0.3)
+            elif self.config.Emulator_ScreenshotMethod == 'nemu_ipc':
+                # nemu_ipc 截图便宜,允许更小默认
+                interval = limit_in(origin, 0.1, 0.2)
+            else:
+                interval = limit_in(origin, 0.1, 0.3)
             if interval != origin:
             if interval != origin:
                 logger.warning(f'Optimization.ScreenshotInterval {origin} is revised to {interval}')
                 logger.warning(f'Optimization.ScreenshotInterval {origin} is revised to {interval}')
                 self.config.script.optimization.screenshot_interval = interval
                 self.config.script.optimization.screenshot_interval = interval
-            # Allow nemu_ipc to have a lower default
-            if self.config.Emulator_ScreenshotMethod == 'nemu_ipc':
-                interval = limit_in(origin, 0.1, 0.2)
         elif interval == 'combat':
         elif interval == 'combat':
             origin = self.config.script.optimization.combat_screenshot_interval
             origin = self.config.script.optimization.combat_screenshot_interval
-            interval = limit_in(origin, 0.3, 1.0)
+            if getattr(self, 'is_desktop', False):
+                # 桌面模式战斗轮询不受 adb 成本约束,允许更小间隔
+                interval = limit_in(origin, 0.1, 1.0)
+            else:
+                interval = limit_in(origin, 0.3, 1.0)
             if interval != origin:
             if interval != origin:
                 logger.warning(f'Optimization.CombatScreenshotInterval {origin} is revised to {interval}')
                 logger.warning(f'Optimization.CombatScreenshotInterval {origin} is revised to {interval}')
                 self.config.script.optimization.combat_screenshot_interval = interval
                 self.config.script.optimization.combat_screenshot_interval = interval