Merge pull request #359 from caofengbin/feature/fix_get_activity_error

fix:修复adb shell dumpsys window displays获取到多个mCurrentFocus时，无法正确得到当前Activity
SonicCloudOrg · Jun 14, 2023 · bfb0753 · bfb0753
2 parents bef0dbe + 5731784
commit bfb0753
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidDeviceBridgeTool.java b/src/main/java/org/cloud/sonic/agent/bridge/android/AndroidDeviceBridgeTool.java
@@ -579,9 +579,13 @@ public static String getCurrentActivity(IDevice iDevice) {
                 String.format("dumpsys window %s", api >= 29 ? "displays" : "windows"));
         String result = "";
         try {
-            String start = cmd.substring(cmd.indexOf("mCurrentFocus="));
-            String end = start.substring(start.indexOf("/") + 1);
-            result = end.substring(0, end.indexOf("}"));
+            Pattern pattern = Pattern.compile("mCurrentFocus=(?!null)[^,]+");
+            Matcher matcher = pattern.matcher(cmd);
+            if (matcher.find()) {
+                String start = cmd.substring(matcher.start());
+                String end = start.substring(start.indexOf("/") + 1);
+                result = end.substring(0, end.indexOf("}"));
+            }
         } catch (Exception ignored) {
         }
         if (result.length() == 0) {