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

update libraries and dependencies's version

Browse Source
This commit is contained in:
hyb1996
2018-10-06 10:12:29 +08:00
parent 9d1fdf3fe9
commit 4851790ad9
20 changed files with 155 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,10 @@ import com.stardust.automator.UiObjectCollection;
import com.stardust.automator.filter.DfsFilter;
import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
@@ -98,6 +102,7 @@ public class UiSelector extends UiGlobalSelector {
return regex;
}
@Override
public UiGlobalSelector classNameMatches(String regex) {
return super.classNameMatches(convertRegex(regex));

4
autojs/src/main/java/com/stardust/autojs/core/graphics/ScriptCanvas.java
View File

@@ -93,10 +93,6 @@ public class ScriptCanvas {
return mCanvas.save();
}
public int save(int saveFlags) {
return mCanvas.save(saveFlags);
}
public int saveLayer(@Nullable RectF bounds, @Nullable Paint paint, int saveFlags) {
return mCanvas.saveLayer(bounds, paint, saveFlags);
}

2
autojs/src/main/java/com/stardust/autojs/engine/LoopBasedJavaScriptEngine.java
View File

@@ -5,6 +5,7 @@ import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.os.MessageQueue;
import android.util.Log;
import com.stardust.autojs.core.looper.LooperHelper;
import com.stardust.autojs.script.JavaScriptSource;
@@ -44,6 +45,7 @@ public class LoopBasedJavaScriptEngine extends RhinoJavaScriptEngine {
if (callback != null)
callback.onResult(o);
} catch (Exception e) {
Log.d("DDDDD", "execute: " + e.getMessage());
if (callback == null) {
throw e;
} else {

1
autojs/src/main/java/com/stardust/autojs/engine/RhinoJavaScriptEngine.java
View File

@@ -205,6 +205,7 @@ public class RhinoJavaScriptEngine extends JavaScriptEngine {
@Override
protected void observeInstructionCount(Context cx, int instructionCount) {
if (Thread.currentThread().isInterrupted() && Looper.myLooper() != Looper.getMainLooper()) {
Log.d("DDDDD", "thread interrupt: " + Thread.currentThread());
throw new ScriptInterruptedException();
}
}