diff --git a/app/src/main/assets/docs/images/ex-gravity.png b/app/src/main/assets/docs/images/ex-gravity.png new file mode 100644 index 00000000..8d89de7e Binary files /dev/null and b/app/src/main/assets/docs/images/ex-gravity.png differ diff --git a/app/src/main/assets/docs/images/ex-layout-gravity.png b/app/src/main/assets/docs/images/ex-layout-gravity.png new file mode 100644 index 00000000..055e488b Binary files /dev/null and b/app/src/main/assets/docs/images/ex-layout-gravity.png differ diff --git a/app/src/main/assets/docs/images/ex-marginLeft.png b/app/src/main/assets/docs/images/ex-marginLeft.png new file mode 100644 index 00000000..790e2a8c Binary files /dev/null and b/app/src/main/assets/docs/images/ex-marginLeft.png differ diff --git a/app/src/main/assets/docs/images/ex-padding.png b/app/src/main/assets/docs/images/ex-padding.png new file mode 100644 index 00000000..669c4264 Binary files /dev/null and b/app/src/main/assets/docs/images/ex-padding.png differ diff --git a/app/src/main/assets/docs/images/ex-properties.png b/app/src/main/assets/docs/images/ex-properties.png new file mode 100644 index 00000000..9a22c6c8 Binary files /dev/null and b/app/src/main/assets/docs/images/ex-properties.png differ diff --git a/app/src/main/assets/docs/images/ex-w.png b/app/src/main/assets/docs/images/ex-w.png new file mode 100644 index 00000000..2e036a70 Binary files /dev/null and b/app/src/main/assets/docs/images/ex-w.png differ diff --git a/app/src/main/assets/docs/images/ex1-horizontal.png b/app/src/main/assets/docs/images/ex1-horizontal.png new file mode 100644 index 00000000..febe5114 Binary files /dev/null and b/app/src/main/assets/docs/images/ex1-horizontal.png differ diff --git a/app/src/main/assets/docs/images/ex1-margin.png b/app/src/main/assets/docs/images/ex1-margin.png new file mode 100644 index 00000000..c46c1c67 Binary files /dev/null and b/app/src/main/assets/docs/images/ex1-margin.png differ diff --git a/app/src/main/assets/docs/images/ex1.png b/app/src/main/assets/docs/images/ex1.png new file mode 100644 index 00000000..de220d55 Binary files /dev/null and b/app/src/main/assets/docs/images/ex1.png differ diff --git a/app/src/main/assets/docs/images/ex2-margin.png b/app/src/main/assets/docs/images/ex2-margin.png new file mode 100644 index 00000000..a615befa Binary files /dev/null and b/app/src/main/assets/docs/images/ex2-margin.png differ diff --git a/autojs/src/main/assets/modules/__selector__.js b/autojs/src/main/assets/modules/__selector__.js index 28397e8c..68c203cc 100644 --- a/autojs/src/main/assets/modules/__selector__.js +++ b/autojs/src/main/assets/modules/__selector__.js @@ -1,7 +1,7 @@ module.exports = function(__runtime__, scope){ - var __selector__ = __runtime__.selector(scope.__engine__); + var __selector__ = __runtime__.selector(); var __obj__ = new java.lang.Object(); for(var method in __selector__){ @@ -16,8 +16,7 @@ module.exports = function(__runtime__, scope){ } return function(){ - var s = __runtime__.selector(scope.__engine__); - return s; + return __runtime__.selector(); }; } diff --git a/autojs/src/main/java/com/stardust/autojs/core/floaty/FloatyWindow.java b/autojs/src/main/java/com/stardust/autojs/core/floaty/FloatyWindow.java index 7b0285e0..c393187b 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/floaty/FloatyWindow.java +++ b/autojs/src/main/java/com/stardust/autojs/core/floaty/FloatyWindow.java @@ -1,8 +1,10 @@ package com.stardust.autojs.core.floaty; import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.WindowManager; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.FrameLayout; import com.stardust.autojs.R; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java index 846edab0..3df7e422 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java @@ -282,7 +282,7 @@ public class ScriptRuntime { return ProcessShell.execCommand(cmd, root != 0); } - public UiSelector selector(ScriptEngine engine) { + public UiSelector selector() { return new UiSelector(accessibilityBridge); } diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java index 7d89c4a4..87a8ceac 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Images.java @@ -152,7 +152,7 @@ public class Images { return ImageWrapper.ofBitmap(bitmap); } - public ImageWrapper decodeBase64(String data){ + public ImageWrapper decodeBase64(String data) { return ImageWrapper.ofBitmap(Drawables.loadData(data)); } @@ -216,10 +216,15 @@ public class Images { } org.opencv.core.Point point = TemplateMatching.fastTemplateMatching(src, template.getMat(), TemplateMatching.MATCHING_METHOD_DEFAULT, weakThreshold, threshold, maxLevel); - if (point != null && rect != null) { - point.x = mScreenMetrics.scaleX((int) (point.x + rect.x)); - point.y = mScreenMetrics.scaleX((int) (point.y + rect.y)); + if (point != null) { + if (rect != null) { + point.x += rect.x; + point.y += rect.y; + } + point.x = mScreenMetrics.scaleX((int) point.x); + point.y = mScreenMetrics.scaleX((int) point.y); } + return point; }