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

Opt: Serial in ADB commands now optional

Browse Source
This commit is contained in:
LmeSzinc
2020-09-03 21:19:43 +08:00
parent ffa36b0fc2
commit 5b38d82f06
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/device/connection.py
View File

@@ -51,7 +51,7 @@ class Connection:
if serial:
cmd = [self.adb_binary, '-s', serial] + cmd
else:
cmd = [self.adb_binary] + cmd
cmd = [self.adb_binary, '-s', self.serial] + cmd
# Use shell=True to disable console window when using GUI.
# Although, there's still a window when you stop running in GUI, which cause by gooey.
@@ -71,6 +71,10 @@ class Connection:
cmd.insert(0, 'forward')
return self.adb_command(cmd, serial)
def adb_push(self, cmd, serial=None):
cmd.insert(0, 'push')
self.adb_command(cmd, serial)
def _adb_connect(self, serial):
if serial.startswith('127.0.0.1'):
msg = self.adb_command(['connect', serial]).decode("utf-8")
@@ -94,5 +98,5 @@ class Connection:
return device
def disable_uiautomator2_auto_quit(self, port=7912, expire=300000):
self.adb_command(['forward', 'tcp:%s' % port, 'tcp:%s' % port], serial=self.serial)
self.adb_forward(['tcp:%s' % port, 'tcp:%s' % port])
requests.post('http://127.0.0.1:%s/newCommandTimeout' % port, data=str(expire))