From 16b39b550dbc21fd39bb81779e2dda5b0e16b678 Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Fri, 9 Mar 2018 13:36:52 +0800
Subject: [PATCH] fix(selector): the behavior of findOnce() is different from
 docs point out

---
 .idea/modules.xml                                     |  2 +-
 app/build.gradle                                      |  2 +-
 app/src/main/res/values/strings.xml                   |  2 +-
 .../autojs/core/accessibility/UiSelector.java         | 11 -----------
 .../main/java/com/stardust/util/DeveloperUtils.java   |  8 ++++----
 inrt/build.gradle                                     |  2 +-
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7e950955..4fac18b4 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <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://$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://$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" />
diff --git a/app/build.gradle b/app/build.gradle
index ecaf3ec2..7cd3eb9f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 23
         versionCode 256
-        versionName "3.1.0 Alpha6"
+        versionName "3.1.0 Beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         ndk {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd676393..394a67e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -342,7 +342,7 @@
     <string name="text_no_phone_state_permission">获取权限失败 :-(</string>
     <string name="text_request_permission">重新授予</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_max_value">56</string>
     <string name="text_text_size">字体大小</string>
diff --git a/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java b/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java
index eb650288..d8aed883 100644
--- a/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java
+++ b/autojs/src/main/java/com/stardust/autojs/core/accessibility/UiSelector.java
@@ -169,17 +169,6 @@ public class UiSelector extends UiGlobalSelector {
 
     public UiObject findOnce(int index) {
         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()) {
             return null;
         }
diff --git a/common/src/main/java/com/stardust/util/DeveloperUtils.java b/common/src/main/java/com/stardust/util/DeveloperUtils.java
index 9a0c6c06..2b62cf85 100644
--- a/common/src/main/java/com/stardust/util/DeveloperUtils.java
+++ b/common/src/main/java/com/stardust/util/DeveloperUtils.java
@@ -167,10 +167,10 @@ public class DeveloperUtils {
                     a.finish();
                     return;
                 }
-                //long[] crc = readCrc(a.getString(crcRes));
-                //if (!checkDexFile(a, crc)) {
-                //  a.finish();
-                //}
+                long[] crc = readCrc(a.getString(crcRes));
+                if (!checkDexFile(a, crc)) {
+                  a.finish();
+                }
 
             }
         });
diff --git a/inrt/build.gradle b/inrt/build.gradle
index b27e48b8..b09aa724 100644
--- a/inrt/build.gradle
+++ b/inrt/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 23
         versionCode 56
-        versionName "1.1.0 Alpha6"
+        versionName "1.1.0 Beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'armeabi-v7a'