1. add printText printInfo

2. 优化 UiSelector
1754048656 · Apr 28, 2024 · 0bac2a8 · 0bac2a8
1 parent 131a9a6
commit 0bac2a8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/main/java/com/linsheng/FATJS/node/UiSelector.java b/app/src/main/java/com/linsheng/FATJS/node/UiSelector.java
@@ -1044,7 +1044,9 @@ private static boolean checkAttribute(AccessibilityNodeInfo node, String key, Ob
             case "textEndsWith":
                 return String.valueOf(node.getText()).endsWith(String.valueOf(value));
             case "textMatches":
-                return String.valueOf(node.getText()).matches(String.valueOf(value));
+                String text = String.valueOf(node.getText());
+                text = text.equals("null") ? "" : text;
+                return text.matches(String.valueOf(value));
             case "desc":
             case "descContains":
                 return String.valueOf(node.getContentDescription()).contains(String.valueOf(value));
@@ -1053,7 +1055,9 @@ private static boolean checkAttribute(AccessibilityNodeInfo node, String key, Ob
             case "descEndsWith":
                 return String.valueOf(node.getContentDescription()).endsWith(String.valueOf(value));
             case "descMatches":
-                return String.valueOf(node.getContentDescription()).matches(String.valueOf(value));
+                String desc = String.valueOf(node.getContentDescription());
+                desc = desc.equals("null") ? "" : desc;
+                return desc.matches(String.valueOf(value));
             case "id":
             case "idContains":
                 return String.valueOf(node.getViewIdResourceName()).contains(String.valueOf(value));