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

fix: floaty.closeAll() not found

Browse Source
This commit is contained in:
hyb1996
2018-02-28 09:52:32 +08:00
parent 3de96662c6
commit c0b03d89d5
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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 {

2
app/release/output.json
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"}}]

8
autojs/src/main/assets/modules/__floaty__.js
View File

@@ -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;
}

2
automator/src/main/java/com/stardust/automator/UiObject.java
View File

@@ -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;

4
inrt/build.gradle
View File

@@ -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'

3
inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.java
View File

@@ -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