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

fix(selector): the behavior of findOnce() is different from docs point out

Browse Source
This commit is contained in:
hyb1996
2018-03-09 13:36:52 +08:00
parent c0b03d89d5
commit 16b39b550d
6 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -2,8 +2,8 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/Auto.js.iml" filepath="$PROJECT_DIR$/Auto.js.iml" />
<module fileurl="file://E:\YiBin\AndroidStudioProjects\NoRootScriptDroid\Auto.js.iml" filepath="E:\YiBin\AndroidStudioProjects\NoRootScriptDroid\Auto.js.iml" /> <module fileurl="file://E:\YiBin\AndroidStudioProjects\NoRootScriptDroid\Auto.js.iml" filepath="E:\YiBin\AndroidStudioProjects\NoRootScriptDroid\Auto.js.iml" />
<module fileurl="file://$PROJECT_DIR$/NoRootScriptDroid.iml" filepath="$PROJECT_DIR$/NoRootScriptDroid.iml" />
<module fileurl="file://C:\Users\Stardust\Documents\AndroidProjects\Auto.js\NoRootScriptDroid.iml" filepath="C:\Users\Stardust\Documents\AndroidProjects\Auto.js\NoRootScriptDroid.iml" /> <module fileurl="file://C:\Users\Stardust\Documents\AndroidProjects\Auto.js\NoRootScriptDroid.iml" filepath="C:\Users\Stardust\Documents\AndroidProjects\Auto.js\NoRootScriptDroid.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/autojs/autojs.iml" filepath="$PROJECT_DIR$/autojs/autojs.iml" /> <module fileurl="file://$PROJECT_DIR$/autojs/autojs.iml" filepath="$PROJECT_DIR$/autojs/autojs.iml" />

2
app/build.gradle
View File

@@ -9,7 +9,7 @@ android {
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 23 targetSdkVersion 23
versionCode 256 versionCode 256
versionName "3.1.0 Alpha6" versionName "3.1.0 Beta"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
ndk { ndk {

2
app/src/main/res/values/strings.xml
View File

@@ -342,7 +342,7 @@
<string name="text_no_phone_state_permission">获取权限失败 :-(</string> <string name="text_no_phone_state_permission">获取权限失败 :-(</string>
<string name="text_request_permission">重新授予</string> <string name="text_request_permission">重新授予</string>
<string name="info_no_phone_state_permission">软件需要显示启动页广告来维持服务器和软件的开发和维护，因此需要\"读取手机状态\"的权限。\n如果您不喜欢广告，可以在设置中设定广告每天只显示一次。</string> <string name="info_no_phone_state_permission">软件需要显示启动页广告来维持服务器和软件的开发和维护，因此需要\"读取手机状态\"的权限。\n如果您不喜欢广告，可以在设置中设定广告每天只显示一次。</string>
<string name="dex_crcs">1805165984\n1603032210\no7Za8UoEvAoTVZPxJAqmQA==V8tiED7XGmzTkAGKbFPjLw==</string> <string name="dex_crcs">2184044085\n3566596539\npJTCkHuhypD9i3UBQ55XQw==RtXsgCTVFA7VYhLeF1TSkg==</string>
<string name="text_size_min_value">8</string> <string name="text_size_min_value">8</string>
<string name="text_size_max_value">56</string> <string name="text_size_max_value">56</string>
<string name="text_text_size">字体大小</string> <string name="text_text_size">字体大小</string>

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

@@ -169,17 +169,6 @@ public class UiSelector extends UiGlobalSelector {
public UiObject findOnce(int index) { public UiObject findOnce(int index) {
UiObjectCollection uiObjectCollection = find(); UiObjectCollection uiObjectCollection = find();
while (uiObjectCollection.empty()) {
if (Thread.currentThread().isInterrupted()) {
throw new ScriptInterruptedException();
}
try {
Thread.sleep(50);
} catch (InterruptedException e) {
throw new ScriptInterruptedException();
}
uiObjectCollection = find();
}
if (index >= uiObjectCollection.size()) { if (index >= uiObjectCollection.size()) {
return null; return null;
} }

8
common/src/main/java/com/stardust/util/DeveloperUtils.java
View File

@@ -167,10 +167,10 @@ public class DeveloperUtils {
a.finish(); a.finish();
return; return;
} }
//long[] crc = readCrc(a.getString(crcRes)); long[] crc = readCrc(a.getString(crcRes));
//if (!checkDexFile(a, crc)) { if (!checkDexFile(a, crc)) {
// a.finish(); a.finish();
//} }
} }
}); });

2
inrt/build.gradle
View File

@@ -9,7 +9,7 @@ android {
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 23 targetSdkVersion 23
versionCode 56 versionCode 56
versionName "1.1.0 Alpha6" versionName "1.1.0 Beta"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a'