sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 16:17:21 +08:00
Code Activity

Fix: Disconnect offline devices before connecting

Browse Source
This commit is contained in:
LmeSzinc
2023-02-19 20:42:28 +08:00
parent 8c7781c541
commit d94cf3f2e0
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module/device/connection.py
View File

@@ -496,17 +496,8 @@ class Connection(ConnectionAttr):
Returns: Returns:
bool: If success bool: If success
""" """
# Skip for emulator-5554
if 'emulator-' in serial:
logger.info(f'"{serial}" is a `emulator-*` serial, skip adb connect')
return True
if re.match(r'^[a-zA-Z0-9]+$', serial):
logger.info(f'"{serial}" seems to be a Android serial, skip adb connect')
return True
# Disconnect offline device before connecting # Disconnect offline device before connecting
device = self.list_device().select(serial=serial).first_or_none() for device in self.list_device():
if device:
if device.status == 'offline': if device.status == 'offline':
logger.warning(f'Device {serial} is offline, disconnect it before connecting') logger.warning(f'Device {serial} is offline, disconnect it before connecting')
self.adb_disconnect(serial) self.adb_disconnect(serial)
@@ -515,7 +506,15 @@ class Connection(ConnectionAttr):
elif device.status == 'device': elif device.status == 'device':
pass pass
else: else:
logger.error(f'Device {serial} is is having a unknown status: {device.status}') logger.warning(f'Device {serial} is is having a unknown status: {device.status}')
# Skip for emulator-5554
if 'emulator-' in serial:
logger.info(f'"{serial}" is a `emulator-*` serial, skip adb connect')
return True
if re.match(r'^[a-zA-Z0-9]+$', serial):
logger.info(f'"{serial}" seems to be a Android serial, skip adb connect')
return True
# Try to connect # Try to connect
for _ in range(3): for _ in range(3):