diff --git a/app/build.gradle b/app/build.gradle index d010d142..ecaf3ec2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 17 targetSdkVersion 23 - versionCode 255 - versionName "3.1.0 Alpha5" + versionCode 256 + versionName "3.1.0 Alpha6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true ndk { diff --git a/app/release/output.json b/app/release/output.json index aaa06e73..b8b87f8d 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":34},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":56},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}] \ No newline at end of file diff --git a/autojs/src/main/assets/modules/__floaty__.js b/autojs/src/main/assets/modules/__floaty__.js index 87d72152..88db8b91 100644 --- a/autojs/src/main/assets/modules/__floaty__.js +++ b/autojs/src/main/assets/modules/__floaty__.js @@ -1,18 +1,18 @@ -module.exports = function(__runtime__, scope){ +module.exports = function(runtime, global){ var floaty = {}; floaty.window = function(layout){ if(typeof(layout) == 'xml'){ layout = layout.toString(); } - return wrap(__runtime__.floaty.window(layout)); + return wrap(runtime.floaty.window(layout)); } floaty.__view_cache__ = {}; function wrap(window){ - var proxyObject = new com.stardust.autojs.rhino.ProxyJavaObject(scope, window, window.getClass()); + var proxyObject = new com.stardust.autojs.rhino.ProxyJavaObject(global, window, window.getClass()); proxyObject.__proxy__ = { set: function(name, value){ window[name] = value; @@ -37,6 +37,8 @@ module.exports = function(__runtime__, scope){ }; return proxyObject; } + + floaty.closeAll = runtime.floaty.closeAll.bind(runtime.floaty); return floaty; } diff --git a/automator/src/main/java/com/stardust/automator/UiObject.java b/automator/src/main/java/com/stardust/automator/UiObject.java index e43e04c3..477fb2a8 100644 --- a/automator/src/main/java/com/stardust/automator/UiObject.java +++ b/automator/src/main/java/com/stardust/automator/UiObject.java @@ -1,6 +1,7 @@ package com.stardust.automator; import android.graphics.Rect; +import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -10,6 +11,7 @@ import android.view.accessibility.AccessibilityNodeInfo; import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator; import com.stardust.view.accessibility.AccessibilityNodeInfoHelper; +import com.stardust.view.accessibility.AccessibilityService; import java.util.ArrayList; import java.util.Arrays; diff --git a/inrt/build.gradle b/inrt/build.gradle index 55498db0..b27e48b8 100644 --- a/inrt/build.gradle +++ b/inrt/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.stardust.auojs.inrt" minSdkVersion 17 targetSdkVersion 23 - versionCode 34 - versionName "1.0.0 Alpha34" + versionCode 56 + versionName "1.1.0 Alpha6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" ndk { abiFilters 'armeabi-v7a' diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java index c3bca7e4..421c9ce6 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java +++ b/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java @@ -10,6 +10,7 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import android.view.View; import com.stardust.auojs.inrt.autojs.AutoJs; import com.stardust.auojs.inrt.launch.AssetsProjectLauncher; @@ -38,7 +39,7 @@ public class LogActivity extends AppCompatActivity { setSupportActionBar(toolbar); ConsoleView consoleView = (ConsoleView) findViewById(R.id.console); consoleView.setConsole((StardustConsole) AutoJs.getInstance().getGlobalConsole()); - + consoleView.findViewById(R.id.input_container).setVisibility(View.GONE); } @Override