tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 选择器有多个条件时无法找到目标的问题

Browse Source 
优化 选择器搜索效率
This commit is contained in:
hyb1996
2018-12-04 13:14:06 +08:00
parent 754819b23f
commit 4b3d4ab84c
26 changed files with 282 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java
View File

@@ -15,10 +15,12 @@ import com.stardust.automator.ActionArgument;
import com.stardust.automator.UiGlobalSelector;
import com.stardust.automator.UiObject;
import com.stardust.automator.UiObjectCollection;
import com.stardust.automator.filter.DfsFilter;
import com.stardust.automator.filter.Filter;
import com.stardust.concurrent.VolatileBox;
import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator;
import org.jetbrains.annotations.NotNull;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
import static androidx.core.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
@@ -106,7 +108,7 @@ public class UiSelector extends UiGlobalSelector {
}
@Override
public UiGlobalSelector textMatches(String regex) {
public UiGlobalSelector textMatches(@NotNull String regex) {
return super.textMatches(convertRegex(regex));
}
@@ -120,22 +122,22 @@ public class UiSelector extends UiGlobalSelector {
@Override
public UiGlobalSelector classNameMatches(String regex) {
public UiGlobalSelector classNameMatches(@NotNull String regex) {
return super.classNameMatches(convertRegex(regex));
}
@Override
public UiGlobalSelector idMatches(String regex) {
public UiGlobalSelector idMatches(@NotNull String regex) {
return super.idMatches(convertRegex(regex));
}
@Override
public UiGlobalSelector packageNameMatches(String regex) {
public UiGlobalSelector packageNameMatches(@NotNull String regex) {
return super.packageNameMatches(convertRegex(regex));
}
@Override
public UiGlobalSelector descMatches(String regex) {
public UiGlobalSelector descMatches(@NotNull String regex) {
return super.descMatches(convertRegex(regex));
}
@@ -224,13 +226,13 @@ public class UiSelector extends UiGlobalSelector {
}
@ScriptInterface
public UiSelector id(final String id) {
public UiSelector id(@NotNull final String id) {
if (!id.contains(":")) {
addFilter(new DfsFilter() {
addFilter(new Filter() {
@Override
protected boolean isIncluded(UiObject nodeInfo) {
public boolean filter(@NotNull UiObject node) {
String fullId = mAccessibilityBridge.getInfoProvider().getLatestPackage() + ":id/" + id;
return fullId.equals(nodeInfo.getViewIdResourceName());
return fullId.equals(node.getViewIdResourceName());
}
@Override
@@ -245,11 +247,11 @@ public class UiSelector extends UiGlobalSelector {
}
@Override
public UiGlobalSelector idStartsWith(String prefix) {
public UiGlobalSelector idStartsWith(@NotNull String prefix) {
if (!prefix.contains(":")) {
addFilter(new DfsFilter() {
addFilter(new Filter() {
@Override
protected boolean isIncluded(UiObject nodeInfo) {
public boolean filter(@NotNull UiObject nodeInfo) {
String fullIdPrefix = mAccessibilityBridge.getInfoProvider().getLatestPackage() + ":id/" + prefix;
String id = nodeInfo.getViewIdResourceName();
return id != null && id.startsWith(fullIdPrefix);