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

4.1.0 Alpha3

Browse Source
This commit is contained in:
hyb1996
2018-12-12 18:48:51 +08:00
parent 975940dced
commit 7ec6a739ad
12 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
autojs/src/main/assets/modules/__app__.js
View File

@@ -62,11 +62,16 @@ module.exports = function (runtime, global) {
throw new Error("class " + i + " not found");
}
}
if(i instanceof android.content.Intent){
context.startActivity(i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
return;
}
if(i && i.root) {
shell("am start " + app.intentToShell(i), true);
}else{
context.startActivity(app.intent(i).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
}
app.sendBroadcast = function (i) {

6
autojs/src/main/assets/modules/__threads__.js
View File

@@ -10,12 +10,12 @@ module.exports = function (__runtime__, scope) {
global.Promise.prototype.wait = function () {
var disposable = threads.disposable();
promise.then(result => {
this.then(result => {
disposable.setAndNotify({ result: result });
}).catch(error => {
cont.resumeError({ error: error });
disposable.setAndNotify({ error: error });
});
var r = cont.blockedGet();
var r = disposable.blockedGet();
if (r.error) {
throw r.error;
}

2
autojs/src/main/java/com/stardust/autojs/core/image/capture/ScreenCapturer.java
View File

@@ -50,7 +50,7 @@ public class ScreenCapturer {
private Handler mHandler;
private Intent mData;
private Context mContext;
private int mOrientation = Configuration.ORIENTATION_UNDEFINED;
private int mOrientation = -1;
private int mDetectedOrientation;
private OrientationEventListener mOrientationEventListener;

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

@@ -2,8 +2,6 @@ package com.stardust.autojs.engine
import android.util.Log
import android.view.View
import com.stardust.autojs.BuildConfig
import com.stardust.autojs.core.ui.ViewExtras
import com.stardust.autojs.engine.module.AssetAndUrlModuleSourceProvider
import com.stardust.autojs.execution.ExecutionConfig
@@ -14,20 +12,18 @@ import com.stardust.autojs.runtime.ScriptRuntime
import com.stardust.autojs.script.JavaScriptSource
import com.stardust.automator.UiObjectCollection
import com.stardust.pio.UncheckedIOException
import org.mozilla.javascript.Context
import org.mozilla.javascript.Script
import org.mozilla.javascript.Scriptable
import org.mozilla.javascript.ScriptableObject
import org.mozilla.javascript.commonjs.module.RequireBuilder
import org.mozilla.javascript.commonjs.module.provider.SoftCachingModuleScriptProvider
import java.io.File
import java.io.IOException
import java.io.InputStreamReader
import java.io.Reader
import java.net.URI
import java.util.Locale
import java.util.*
import java.util.concurrent.ConcurrentHashMap
/**

1
autojs/src/main/res/xml/accessibility_service_config.xml
View File

@@ -3,7 +3,6 @@
android:accessibilityEventTypes="typeAllMask"
android:accessibilityFeedbackType="feedbackAllMask"
android:accessibilityFlags="flagIncludeNotImportantViews|flagReportViewIds|flagRetrieveInteractiveWindows|flagRequestEnhancedWebAccessibility|flagRequestFilterKeyEvents"
android:canPerformGestures="true"
android:canRequestEnhancedWebAccessibility="true"
android:canRequestFilterKeyEvents="true"
android:canRetrieveWindowContent="true"