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

Fix: Not enough values to unpack in app_current_adb()

Browse Source
This commit is contained in:
LmeSzinc
2022-01-25 21:47:39 +08:00
parent 824098b829
commit 25076cf5e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/device/method/adb.py
View File

@@ -122,7 +122,7 @@ class Adb(Connection):
_focusedRE = re.compile( _focusedRE = re.compile(
r'mCurrentFocus=Window{.*\s+(?P<package>[^\s]+)/(?P<activity>[^\s]+)\}' r'mCurrentFocus=Window{.*\s+(?P<package>[^\s]+)/(?P<activity>[^\s]+)\}'
) )
m = _focusedRE.search(self.adb_shell(['dumpsys', 'window', 'windows'])[0]) m = _focusedRE.search(self.adb_shell(['dumpsys', 'window', 'windows']))
if m: if m:
return m.group('package') return m.group('package')
@@ -130,7 +130,7 @@ class Adb(Connection):
_activityRE = re.compile( _activityRE = re.compile(
r'ACTIVITY (?P<package>[^\s]+)/(?P<activity>[^/\s]+) \w+ pid=(?P<pid>\d+)' r'ACTIVITY (?P<package>[^\s]+)/(?P<activity>[^/\s]+) \w+ pid=(?P<pid>\d+)'
) )
output, _ = self.adb_shell(['dumpsys', 'activity', 'top']) output = self.adb_shell(['dumpsys', 'activity', 'top'])
ms = _activityRE.finditer(output) ms = _activityRE.finditer(output)
ret = None ret = None
for m in ms: for m in ms: