获取当前activity方法兼容两种方案以保证正常获取到结果

gb112211 · gb112211 · commit a1ab04de3329 · 2019-04-11T16:29:28.000+08:00
diff --git a/python/scriptUtils/utils.py b/python/scriptUtils/utils.py
@@ -144,12 +144,14 @@ def kill_process(pkg_name):
 #&#33719;&#21462;&#35774;&#22791;&#19978;&#24403;&#21069;&#24212;&#29992;&#30340;&#21253;&#21517;&#19982;activity
 def get_focused_package_and_activity():
     pattern = re.compile(r"[a-zA-Z0-9\.]+/.[a-zA-Z0-9\.]+")
-    #out = shell("dumpsys window w | %s \/ | %s name=" %(find_util, find_util)).stdout.read()
-
-    #return pattern.findall(out)[0]
-    str = shell("dumpsys activity | %s mFocusedActivity" %find_util).stdout.read()
-    #return shell("dumpsys activity | %s mFocusedActivity" %find_util).stdout.read().split()[-1][:-1]
-    return pattern.findall(str)[0]
+    tmp = shell("dumpsys activity | %s mFocusedActivity" %find_util).stdout.read()
+    name = ""
+    try:
+        name = pattern.findall(tmp)[0]
+    except:
+        tmp = shell("dumpsys window w | %s \/ | %s name=" %(find_util, find_util)).stdout.read()
+        name = pattern.findall(tmp)[0]
+    return name
 
 #&#33719;&#21462;&#24403;&#21069;&#24212;&#29992;&#30340;&#21253;&#21517;
 def get_current_package_name():
