sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Fix: Connecting device over http

Browse Source
This commit is contained in:
LmeSzinc 2022-09-30 12:18:25 +08:00
parent 8653f07e1c
commit b161f14532
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/device/connection.py
View File

@ -80,6 +80,7 @@ class Connection(ConnectionAttr):
config (AzurLaneConfig, str): Name of the user config under ./config
"""
super().__init__(config)
if not self.is_over_http:
self.detect_device()
# Connect

4
module/device/connection_attr.py
View File

@ -87,11 +87,11 @@ class ConnectionAttr:
self.config.Emulator_ScreenshotMethod = 'uiautomator2'
self.config.Emulator_ControlMethod = 'uiautomator2'
if self.is_over_http:
if self.config.Emulator_ScreenshotMethod not in ["ADB", "uiautomator2"] \
if self.config.Emulator_ScreenshotMethod not in ["ADB", "uiautomator2", "aScreenCap"] \
or self.config.Emulator_ControlMethod not in ["ADB", "uiautomator2", "minitouch"]:
logger.warning(
f'When connecting to a device over http: {self.serial} '
f'ScreenshotMethod can only use ["ADB", "uiautomator2"], '
f'ScreenshotMethod can only use ["ADB", "uiautomator2", "aScreenCap"], '
f'ControlMethod can only use ["ADB", "uiautomator2", "minitouch"]'
)
raise RequestHumanTakeover