fix: floaty.closeAll() not found

This commit is contained in:
hyb1996 committed 2018-02-28 09:52:32 +08:00
1 parent 3de96662c6
commit c0b03d89d5
6 files changed
+14 -9

No files matched your search

+2 -2
View File
@@ -8,8 +8,8 @@ android {
applicationId "com.stardust.scriptdroid" applicationId "com.stardust.scriptdroid"
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 23 targetSdkVersion 23
versionCode 255 versionCode 256
versionName "3.1.0 Alpha5" versionName "3.1.0 Alpha6"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
ndk { ndk {
+1 -1
View File
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":34},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":56},"path":"inrt-release.apk","properties":{"packageId":"com.stardust.auojs.inrt","split":"","minSdkVersion":"17"}}]
+5 -3
View File
@@ -1,18 +1,18 @@
module.exports = function(__runtime__, scope){ module.exports = function(runtime, global){
var floaty = {}; var floaty = {};
floaty.window = function(layout){ floaty.window = function(layout){
if(typeof(layout) == 'xml'){ if(typeof(layout) == 'xml'){
layout = layout.toString(); layout = layout.toString();
} }
return wrap(__runtime__.floaty.window(layout)); return wrap(runtime.floaty.window(layout));
} }
floaty.__view_cache__ = {}; floaty.__view_cache__ = {};
function wrap(window){ 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__ = { proxyObject.__proxy__ = {
set: function(name, value){ set: function(name, value){
window[name] = value; window[name] = value;
@@ -37,6 +37,8 @@ module.exports = function(__runtime__, scope){
}; };
return proxyObject; return proxyObject;
} }
floaty.closeAll = runtime.floaty.closeAll.bind(runtime.floaty);
return floaty; return floaty;
} }
@@ -1,6 +1,7 @@
package com.stardust.automator; package com.stardust.automator;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; 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.AccessibilityNodeInfoAllocator;
import com.stardust.view.accessibility.AccessibilityNodeInfoHelper; import com.stardust.view.accessibility.AccessibilityNodeInfoHelper;
import com.stardust.view.accessibility.AccessibilityService;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
+2 -2
View File
@@ -8,8 +8,8 @@ android {
applicationId "com.stardust.auojs.inrt" applicationId "com.stardust.auojs.inrt"
minSdkVersion 17 minSdkVersion 17
targetSdkVersion 23 targetSdkVersion 23
versionCode 34 versionCode 56
versionName "1.0.0 Alpha34" versionName "1.1.0 Alpha6"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a'
@@ -10,6 +10,7 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import com.stardust.auojs.inrt.autojs.AutoJs; import com.stardust.auojs.inrt.autojs.AutoJs;
import com.stardust.auojs.inrt.launch.AssetsProjectLauncher; import com.stardust.auojs.inrt.launch.AssetsProjectLauncher;
@@ -38,7 +39,7 @@ public class LogActivity extends AppCompatActivity {
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
ConsoleView consoleView = (ConsoleView) findViewById(R.id.console); ConsoleView consoleView = (ConsoleView) findViewById(R.id.console);
consoleView.setConsole((StardustConsole) AutoJs.getInstance().getGlobalConsole()); consoleView.setConsole((StardustConsole) AutoJs.getInstance().getGlobalConsole());
consoleView.findViewById(R.id.input_container).setVisibility(View.GONE);
} }
@Override @Override