add dialogs, fix code completion

This commit is contained in:
hyb1996 committed 2017-05-08 15:22:01 +08:00
1 parent 472bd46b87
commit 0349c113ca
40 files changed
+958 -158

No files matched your search

+1
View File
@@ -3,6 +3,7 @@
<words> <words>
<w>dismissable</w> <w>dismissable</w>
<w>interruptible</w> <w>interruptible</w>
<w>prefill</w>
<w>scriptable</w> <w>scriptable</w>
<w>tasker</w> <w>tasker</w>
</words> </words>
+2 -2
View File
@@ -5,8 +5,8 @@
<list size="8"> <list size="8">
<item index="0" class="java.lang.String" itemvalue="android.support.annotation.Keep" /> <item index="0" class="java.lang.String" itemvalue="android.support.annotation.Keep" />
<item index="1" class="java.lang.String" itemvalue="android.webkit.JavascriptInterface" /> <item index="1" class="java.lang.String" itemvalue="android.webkit.JavascriptInterface" />
<item index="2" class="java.lang.String" itemvalue="com.stardust.autojs.runtime.JavascriptClass" /> <item index="2" class="java.lang.String" itemvalue="com.stardust.autojs.runtime.ScriptClass" />
<item index="3" class="java.lang.String" itemvalue="com.stardust.autojs.runtime.JavascriptInterface" /> <item index="3" class="java.lang.String" itemvalue="com.stardust.autojs.runtime.ScriptInterface" />
<item index="4" class="java.lang.String" itemvalue="com.stardust.view.ViewBind.Click" /> <item index="4" class="java.lang.String" itemvalue="com.stardust.view.ViewBind.Click" />
<item index="5" class="java.lang.String" itemvalue="com.stardust.view.ViewBinding.Check" /> <item index="5" class="java.lang.String" itemvalue="com.stardust.view.ViewBinding.Check" />
<item index="6" class="java.lang.String" itemvalue="com.stardust.view.ViewBinding.Click" /> <item index="6" class="java.lang.String" itemvalue="com.stardust.view.ViewBinding.Click" />
+2 -2
View File
@@ -9,8 +9,8 @@ android {
applicationId "com.stardust.scriptdroid" applicationId "com.stardust.scriptdroid"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 23 targetSdkVersion 23
versionCode 121 versionCode 122
versionName "2.0.9b Beta" versionName "2.0.9c Alpha"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
ndk { ndk {
+1 -1
View File
@@ -36,7 +36,7 @@
@org.greenrobot.eventbus.Subscribe <methods>; @org.greenrobot.eventbus.Subscribe <methods>;
} }
-keepclassmembers class ** { -keepclassmembers class ** {
@com.stardust.autojs.runtime.JavascriptInterface <methods>; @com.stardust.autojs.runtime.ScriptInterface <methods>;
} }
-keep class org.msgpack.** { *; } -keep class org.msgpack.** { *; }
+82 -1
View File
@@ -1 +1,82 @@
__importClass__(com.stardust.scriptdroid.autojs.Shell); __importClass__(com.stardust.scriptdroid.autojs.api.Shell);
var dialogs = {};
dialogs.rawInput = function(title, prefill){
prefill = prefill || "";
return __runtime__.dialogs.rawInput(title, prefill);
};
dialogs.input = function(title, prefill){
return eval(rawInput(title, prefill));
}
dialogs.prompt = dialogs.rawInput;
dialogs.alert = function(title, prefill){
prefill = prefill || "";
return __runtime__.dialogs.alert(title, prefill);
}
dialogs.confirm = function(title, prefill){
prefill = prefill || "";
return __runtime__.dialogs.confirm(title, prefill);
}
dialogs.select = function(title, items){
return __runtime__.dialogs.select(title, [].slice.call(arguments, 1));
}
dialogs.singleChoice = function(title, index, items){
return __runtime__.dialogs.singleChoice(title, index, [].slice.call(arguments, 2));
}
dialogs.multiChoice = function(title, index, items){
var javaArray = __runtime__.dialogs.multiChoice(title, index, [].slice.call(arguments, 2));
var jsArray = {};
for each(i in javaArray){
jsArray.push(i);
}
return jsArray;
}
var rawInput = function(title, prefill){
return dialogs.rawInput(title, prefill);
}
var input = function(title, prefill){
return dialogs.input(title, prefill);
}
var alert = function(title, prefill){
dialogs.alert(title, prefill);
}
var confirm = function(title, prefill){
return dialogs.confirm(title, prefill);
}
var prompt = function(title, prefill){
return dialogs.prompt(title, prefill);
}
/*
dialogs.rawInput = function(title, prefill){
prefill = prefill || "";
return __runtime__.dialogs.rawInput(title, prefill);
}
dialogs.input = function(title, prefill){
return eval(rawInput(title, prefill));
}
dialogs.alert = function(title, content){
__runtime__.dialogs.alert(title, content);
}
dialogs.select = function(title, content){
__runtime__.dialogs.alert(title, content);
}
*/
+62
View File
@@ -0,0 +1,62 @@
[ "toast",
"app",
"launchPackage",
"launch",
"launchApp",
"getPackageName",
"openAppSetting",
"sleep",
"isStopped",
"notStopped",
"stop",
"console",
"log",
"print",
"err",
"openConsole",
"clearConsole",
"shell",
"currentPackage",
"currentActivity",
"back",
"home",
"powerDialog",
"notifications",
"quickSettings",
"recents",
"splitScreen",
"click",
"longClick",
"scrollDown",
"scrollUp",
"input",
"setClip",
"SetScreenMetrics",
"Tap",
"Swipe",
"Screencap",
"KeyCode",
"Home",
"Back",
"Power",
"Up",
"Down",
"Left",
"Right",
"OK",
"VolumeUp",
"VolumeDown",
"Menu",
"Camera",
"Text",
"selector",
"open",
"newInjectableWebClient",
"newInjectableWebView",
"dialogs",
"rawInput",
"input",
"alert",
"confirm",
"prompt"
]
@@ -0,0 +1,31 @@
var i = dialogs.select("请选择工具", "获取应用包名", "打开应用详情页", "卸载应用");
if(i == -1){
alert("没有选择任何工具!");
}
switch(i){
case 0:
//获取应用包名
appName = rawInput("请输入应用名称", "QQ");
packageName = getPackageName(appName);
toast(packageName);
setClip(packageName);
toast("已复制到剪贴板");
break;
case 1:
//打开应用详情页
appName = rawInput("请输入应用名称", "微信");
openAppSetting(getPackageName(appName));
break;
case 2:
//卸载应用
appName = rawInput("请输入应用名称");
packageName = getPackageName(appName);
if(packageName == ""){
toast("应用不存在");
}else if(confirm("确定卸载应用" + packageName + "吗?")){
app.uninstall(packageName);
}
break;
}
@@ -0,0 +1,2 @@
var appName = rawInput("请输入应用名称");
launchApp(appName);
@@ -0,0 +1,22 @@
var num1 = input("请输入第一个数字");
var op = dialogs.singleChoice("请选择运算", 0, "加", "减", "乘", "除", "幂");
var num2 = input("请输入第二个数字");
var result = 0;
switch(op){
case 0:
result = num1 + num2;
break;
case 1:
result = num1 - num2;
break;
case 2:
result = num1 * num2;
break;
case 3:
result = num1 / num2;
break;
case 4:
result = Math.pow(num1, num2);
break;
}
alert("运算结果", result);
@@ -0,0 +1,20 @@
SetScreenMetrics(1080, 1920);
launchApp("QQ");
//点击动态图标
Tap(891, 1851);
//点击好友动态
Tap(192, 453);
//点击头像
Tap(155, 638);
//点击留言
Tap(747, 775);
while(true){
//点击箭头图标
Tap(1029, 433);
//点击删除
Tap(530, 820);
//点击确定
Tap(331, 1122);
}
@@ -31,7 +31,6 @@ public class App extends MultiDexApplication {
private static final String TAG = "App"; private static final String TAG = "App";
private static WeakReference<App> instance; private static WeakReference<App> instance;
private static WeakReference<Activity> currentActivity;
public static App getApp() { public static App getApp() {
return instance.get(); return instance.get();
@@ -89,27 +88,23 @@ public class App extends MultiDexApplication {
@Override @Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) { public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
super.onActivityCreated(activity, savedInstanceState); super.onActivityCreated(activity, savedInstanceState);
AutoJs.getInstance().getAppUtils().setCurrentActivity(activity);
} }
@Override @Override
public void onActivityPaused(Activity activity) { public void onActivityPaused(Activity activity) {
currentActivity = null; AutoJs.getInstance().getAppUtils().setCurrentActivity(null);
} }
@Override @Override
public void onActivityResumed(Activity activity) { public void onActivityResumed(Activity activity) {
ScreenMetrics.initIfNeeded(activity); ScreenMetrics.initIfNeeded(activity);
currentActivity = new WeakReference<>(activity); AutoJs.getInstance().getAppUtils().setCurrentActivity(activity);
} }
}); });
} }
@Keep
public static Activity currentActivity() {
return currentActivity.get();
}
public static String getResString(int id) { public static String getResString(int id) {
return getApp().getString(id); return getApp().getString(id);
} }
@@ -8,7 +8,10 @@ import com.stardust.autojs.ScriptEngineService;
import com.stardust.autojs.ScriptEngineServiceBuilder; import com.stardust.autojs.ScriptEngineServiceBuilder;
import com.stardust.autojs.engine.NodeJsJavaScriptEngineManager; import com.stardust.autojs.engine.NodeJsJavaScriptEngineManager;
import com.stardust.autojs.engine.ScriptEngineManager; import com.stardust.autojs.engine.ScriptEngineManager;
import com.stardust.autojs.runtime.*; import com.stardust.autojs.runtime.AccessibilityBridge;
import com.stardust.autojs.runtime.ScriptStopException;
import com.stardust.autojs.runtime.api.AbstractShell;
import com.stardust.autojs.runtime.api.AppUtils;
import com.stardust.automator.AccessibilityEventCommandHost; import com.stardust.automator.AccessibilityEventCommandHost;
import com.stardust.automator.simple_action.SimpleActionPerformHost; import com.stardust.automator.simple_action.SimpleActionPerformHost;
import com.stardust.pio.PFile; import com.stardust.pio.PFile;
@@ -16,9 +19,9 @@ import com.stardust.pio.UncheckedIOException;
import com.stardust.scriptdroid.App; import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.Pref;
import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.api.Shell;
import com.stardust.scriptdroid.script.StorageScriptProvider; import com.stardust.scriptdroid.script.StorageScriptProvider;
import com.stardust.scriptdroid.ui.console.StardustConsole; import com.stardust.scriptdroid.ui.console.StardustConsole;
import com.stardust.util.AssetsCache;
import com.stardust.util.Supplier; import com.stardust.util.Supplier;
import com.stardust.util.UiHandler; import com.stardust.util.UiHandler;
import com.stardust.view.accessibility.AccessibilityInfoProvider; import com.stardust.view.accessibility.AccessibilityInfoProvider;
@@ -56,10 +59,12 @@ public class AutoJs implements AccessibilityBridge {
private final ScriptEngineService mScriptEngineService; private final ScriptEngineService mScriptEngineService;
private final AccessibilityInfoProvider mAccessibilityInfoProvider; private final AccessibilityInfoProvider mAccessibilityInfoProvider;
private final UiHandler mUiHandler; private final UiHandler mUiHandler;
private final AppUtils mAppUtils;
private AutoJs(final Context context) { private AutoJs(final Context context) {
mUiHandler = new UiHandler(context); mUiHandler = new UiHandler(context);
mAppUtils = new AppUtils(context);
mAccessibilityInfoProvider = new AccessibilityInfoProvider(context.getPackageManager()); mAccessibilityInfoProvider = new AccessibilityInfoProvider(context.getPackageManager());
ScriptEngineManager manager = createScriptEngineManager(context); ScriptEngineManager manager = createScriptEngineManager(context);
mScriptEngineService = new ScriptEngineServiceBuilder() mScriptEngineService = new ScriptEngineServiceBuilder()
@@ -70,7 +75,17 @@ public class AutoJs implements AccessibilityBridge {
@Override @Override
public ScriptRuntime get() { public ScriptRuntime get() {
return new ScriptRuntime(mUiHandler, new StardustConsole(mUiHandler), AutoJs.this); return new ScriptRuntime.Builder()
.setAppUtils(mAppUtils)
.setConsole(new StardustConsole(mUiHandler))
.setAccessibilityBridge(AutoJs.this)
.setUiHandler(mUiHandler)
.setShellSupplier(new Supplier<AbstractShell>() {
@Override
public AbstractShell get() {
return new Shell(true);
}
}).build();
} }
}) })
.build(); .build();
@@ -100,6 +115,10 @@ public class AutoJs implements AccessibilityBridge {
return mAccessibilityActionRecorder; return mAccessibilityActionRecorder;
} }
public AppUtils getAppUtils() {
return mAppUtils;
}
public UiHandler getUiHandler() { public UiHandler getUiHandler() {
return mUiHandler; return mUiHandler;
} }
@@ -0,0 +1,71 @@
package com.stardust.scriptdroid.autojs;
import com.stardust.autojs.runtime.AccessibilityBridge;
import com.stardust.autojs.runtime.ScriptVariable;
import com.stardust.autojs.runtime.api.AbstractShell;
import com.stardust.autojs.runtime.api.AppUtils;
import com.stardust.autojs.runtime.api.Console;
import com.stardust.scriptdroid.autojs.api.Dialogs;
import com.stardust.util.Supplier;
import com.stardust.util.UiHandler;
/**
* Created by Stardust on 2017/5/8.
*/
public class ScriptRuntime extends com.stardust.autojs.runtime.ScriptRuntime {
public static class Builder {
private AppUtils mAppUtils;
private UiHandler mUiHandler;
private Console mConsole;
private AccessibilityBridge mAccessibilityBridge;
private Supplier<AbstractShell> mShellSupplier;
public Builder() {
}
public Builder setAppUtils(AppUtils appUtils) {
mAppUtils = appUtils;
return this;
}
public Builder setUiHandler(UiHandler uiHandler) {
mUiHandler = uiHandler;
return this;
}
public Builder setConsole(Console console) {
mConsole = console;
return this;
}
public Builder setAccessibilityBridge(AccessibilityBridge accessibilityBridge) {
mAccessibilityBridge = accessibilityBridge;
return this;
}
public Builder setShellSupplier(Supplier<AbstractShell> shellSupplier) {
mShellSupplier = shellSupplier;
return this;
}
public ScriptRuntime build() {
return new ScriptRuntime(mAppUtils, mUiHandler, mConsole, mAccessibilityBridge, mShellSupplier);
}
}
@ScriptVariable
public Dialogs dialogs;
public ScriptRuntime(AppUtils appUtils, UiHandler uiHandler, Console console, AccessibilityBridge accessibilityBridge, Supplier<AbstractShell> shellSupplier) {
super(appUtils, uiHandler, console, accessibilityBridge, shellSupplier);
dialogs = new Dialogs(appUtils, uiHandler);
}
}
@@ -0,0 +1,135 @@
package com.stardust.scriptdroid.autojs.api;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.View;
import android.view.WindowManager;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.util.UiHandler;
/**
* Created by Stardust on 2017/5/8.
*/
public class BlockedMaterialDialog extends MaterialDialog {
protected BlockedMaterialDialog(MaterialDialog.Builder builder) {
super(builder);
}
@Override
public void show() {
if (!(getContext() instanceof Activity)) {
getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
}
super.show();
}
public static class Builder extends MaterialDialog.Builder {
private UiHandler mUiHandler;
public Builder(Context context, UiHandler uiHandler) {
super(context);
mUiHandler = uiHandler;
}
public MaterialDialog.Builder input(@Nullable CharSequence hint, @Nullable CharSequence prefill, boolean allowEmptyInput, final VolatileBox<String> result) {
dismissListener(result);
super.input(hint, prefill, allowEmptyInput, new MaterialDialog.InputCallback() {
@Override
public void onInput(@NonNull MaterialDialog dialog, CharSequence input) {
result.set(input.toString());
synchronized (result) {
result.notify();
}
}
});
return this;
}
public Builder confirm(final VolatileBox<Boolean> result) {
onAny(new SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
if (which == DialogAction.POSITIVE) {
result.setAndNotify(true);
} else {
result.setAndNotify(false);
}
}
});
return this;
}
public MaterialDialog.Builder itemsCallback(final VolatileBox<Integer> result) {
dismissListener(result);
super.itemsCallback(new ListCallback() {
@Override
public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) {
result.setAndNotify(position);
}
});
return this;
}
public MaterialDialog.Builder itemsCallbackMultiChoice(@Nullable Integer[] selectedIndices, final VolatileBox<Integer[]> result) {
dismissListener(result);
super.itemsCallbackMultiChoice(selectedIndices, new ListCallbackMultiChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, Integer[] which, CharSequence[] text) {
result.setAndNotify(which);
return true;
}
});
return this;
}
public MaterialDialog.Builder itemsCallbackSingleChoice(int selectedIndex, final VolatileBox<Integer> result) {
dismissListener(result);
super.itemsCallbackSingleChoice(selectedIndex, new ListCallbackSingleChoice() {
@Override
public boolean onSelection(MaterialDialog dialog, View itemView, int which, CharSequence text) {
result.setAndNotify(which);
return true;
}
});
return this;
}
public Builder dismissListener(final VolatileBox<?> result) {
super.dismissListener(new OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
synchronized (result) {
result.notify();
}
}
});
return this;
}
@Override
public MaterialDialog show() {
mUiHandler.post(new Runnable() {
@Override
public void run() {
Builder.super.show();
}
});
return null;
}
@Override
public MaterialDialog build() {
return new BlockedMaterialDialog(this);
}
}
}
@@ -0,0 +1,123 @@
package com.stardust.scriptdroid.autojs.api;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.DialogInterface;
import android.text.TextUtils;
import android.view.ContextThemeWrapper;
import com.afollestad.materialdialogs.MaterialDialog;
import com.stardust.autojs.runtime.ScriptInterface;
import com.stardust.autojs.runtime.ScriptInterruptedException;
import com.stardust.autojs.runtime.api.AppUtils;
import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.R;
import com.stardust.util.ArrayUtils;
import com.stardust.util.UiHandler;
/**
* Created by Stardust on 2017/5/8.
*/
public class Dialogs {
private AppUtils mAppUtils;
private UiHandler mUiHandler;
private ContextWrapper mContextWrapper;
public Dialogs(AppUtils appUtils, UiHandler uiHandler) {
mAppUtils = appUtils;
mUiHandler = uiHandler;
}
@ScriptInterface
public String rawInput(String title, String prefill) {
VolatileBox<String> result = new VolatileBox<>(null);
dialogBuilder()
.input(null, prefill, true, result)
.title(title)
.show();
return result.blockedGet();
}
@ScriptInterface
public void alert(String title, String content) {
VolatileBox<Void> lock = new VolatileBox<>();
MaterialDialog.Builder builder = dialogBuilder()
.dismissListener(lock)
.title(title)
.positiveText(R.string.ok);
if (!TextUtils.isEmpty(content)) {
builder.content(content);
}
builder.show();
lock.blockedGet();
}
@ScriptInterface
public boolean confirm(String title, String content) {
VolatileBox<Boolean> result = new VolatileBox<>(false);
MaterialDialog.Builder builder = dialogBuilder()
.dismissListener(result)
.confirm(result)
.title(title)
.positiveText(R.string.ok)
.negativeText(R.string.cancel);
if (!TextUtils.isEmpty(content)) {
builder.content(content);
}
builder.show();
return result.blockedGet();
}
private Context getContext() {
if (mContextWrapper == null) {
mContextWrapper = new ContextThemeWrapper(mUiHandler.getContext(), R.style.AppTheme);
}
return mContextWrapper;
}
@ScriptInterface
public int select(String title, String... items) {
VolatileBox<Integer> result = new VolatileBox<>(-1);
dialogBuilder()
.itemsCallback(result)
.title(title)
.items((CharSequence[]) items)
.show();
return result.blockedGet();
}
@ScriptInterface
public int singleChoice(String title, int selectedIndex, String... items) {
VolatileBox<Integer> result = new VolatileBox<>(-1);
dialogBuilder()
.itemsCallbackSingleChoice(selectedIndex, result)
.title(title)
.positiveText(R.string.ok)
.items((CharSequence[]) items)
.show();
return result.blockedGet();
}
@ScriptInterface
public int[] multiChoice(String title, int[] indices, String... items) {
VolatileBox<Integer[]> result = new VolatileBox<>(new Integer[0]);
dialogBuilder()
.itemsCallbackMultiChoice(ArrayUtils.box(indices), result)
.title(title)
.positiveText(R.string.ok)
.items((CharSequence[]) items)
.show();
return ArrayUtils.unbox(result.blockedGet());
}
private BlockedMaterialDialog.Builder dialogBuilder() {
Context context = mAppUtils.getCurrentActivity();
if (context == null) {
context = getContext();
}
return new BlockedMaterialDialog.Builder(context, mUiHandler);
}
}
@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.autojs; package com.stardust.scriptdroid.autojs.api;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
@@ -10,6 +10,7 @@ import com.stardust.autojs.runtime.api.AbstractShell;
import com.stardust.lang.ThreadCompat; import com.stardust.lang.ThreadCompat;
import com.stardust.pio.UncheckedIOException; import com.stardust.pio.UncheckedIOException;
import com.stardust.scriptdroid.App; import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.autojs.AutoJs;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@@ -0,0 +1,47 @@
package com.stardust.scriptdroid.autojs.api;
import com.stardust.autojs.runtime.ScriptInterruptedException;
/**
* Created by Stardust on 2017/5/8.
*/
public class VolatileBox<T> {
private volatile T mValue;
public VolatileBox() {
}
public VolatileBox(T value) {
set(value);
}
public T get() {
return mValue;
}
public void set(T value) {
mValue = value;
}
public void setAndNotify(T value) {
mValue = value;
synchronized (this) {
notify();
}
}
public T blockedGet() {
synchronized (this) {
try {
this.wait();
} catch (InterruptedException e) {
throw new ScriptInterruptedException();
}
}
return mValue;
}
}
@@ -1,24 +1,8 @@
package com.stardust.scriptdroid.record.inputevent; package com.stardust.scriptdroid.record.inputevent;
import android.preference.PreferenceManager; import com.stardust.scriptdroid.autojs.api.Shell;
import android.util.Log;
import com.stardust.pio.UncheckedIOException;
import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.autojs.Shell;
import com.stardust.scriptdroid.record.Recorder; import com.stardust.scriptdroid.record.Recorder;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import jackpal.androidterm.ShellTermSession;
import jackpal.androidterm.emulatorview.TermSession;
import jackpal.androidterm.util.TermSettings;
/** /**
* Created by Stardust on 2017/3/6. * Created by Stardust on 2017/3/6.
*/ */
@@ -23,7 +23,7 @@ public class InputEventToSendEventJsConverter extends InputEventConverter {
public InputEventToSendEventJsConverter() { public InputEventToSendEventJsConverter() {
mCode.append("var sh = new Shell(true);\n") mCode.append("var sh = new Shell(true);\n")
.append("sh.SetScreenScale(").append(getScreenWidth()).append(", ") .append("sh.SetScreenMetrics(").append(getScreenWidth()).append(", ")
.append(getScreenHeight()).append(");\n"); .append(getScreenHeight()).append(");\n");
} }
@@ -1,12 +1,19 @@
package com.stardust.scriptdroid.ui.edit.completion; package com.stardust.scriptdroid.ui.edit.completion;
import android.content.Context;
import android.text.Editable; import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;
import com.google.gson.Gson;
import com.stardust.pio.PFile;
import com.stardust.pio.UncheckedIOException;
import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.Pref;
import com.jecelyin.editor.v2.core.widget.TextView; import com.jecelyin.editor.v2.core.widget.TextView;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -106,7 +113,7 @@ public class CodeCompletion implements TextWatcher {
mFunctions = functions; mFunctions = functions;
} }
private String[] mFunctions = {"toast", "launchPackage", "launch", "launchApp", "click", "longClick", "scrollUp", "scrollDown", "select", "focus", "paste", "input", "sleep", "isStopped", "notStopped", "printf", "err", "openConsole", "clearConsole", "shell", "getTexts", "getPackageName", "getActivityName", "setClip", "addAccessibilityDelegate"}; private String[] mFunctions = new String[0];
private boolean searchCodeCompletion(String str) { private boolean searchCodeCompletion(String str) {
Collection<CodeCompletionItem> c = searchWordCompletion(str); Collection<CodeCompletionItem> c = searchWordCompletion(str);
@@ -148,8 +155,7 @@ public class CodeCompletion implements TextWatcher {
return searchCodeCompletion(str, KEYWORDS); return searchCodeCompletion(str, KEYWORDS);
} }
private static final String[] DEFAULT_CODE_COMPLETIONS = new String[]{"=", "(", ")", ";", "{", "}", "\"", "!", "[", "]", "\\", ">", "<", ".", ", "};
private static final String[] DEFAULT_CODE_COMPLETIONS = new String[]{"=", "(", ")", ";", "{", "}", "\"", "!", "[", "]", "\\", ".", ", "};
private static final List<CodeCompletionItem> DEFAULT_CODE_COMPLETION_LIST = new ArrayList<>(); private static final List<CodeCompletionItem> DEFAULT_CODE_COMPLETION_LIST = new ArrayList<>();
static { static {
@@ -14,10 +14,14 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import android.workground.WrapContentLinearLayoutManager; import android.workground.WrapContentLinearLayoutManager;
import com.google.gson.Gson;
import com.stardust.pio.UncheckedIOException;
import com.stardust.scriptdroid.App; import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs; import com.stardust.scriptdroid.autojs.AutoJs;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -79,7 +83,7 @@ public class InputMethodEnhanceBar extends RecyclerView implements CodeCompletio
private void init() { private void init() {
setAdapter(new CodeCompletionAdapter()); setAdapter(new CodeCompletionAdapter());
setLayoutManager(new WrapContentLinearLayoutManager(getContext(), HORIZONTAL, false)); setLayoutManager(new WrapContentLinearLayoutManager(getContext(), HORIZONTAL, false));
mCodeCompletion.setFunctions(AutoJs.getInstance().getScriptEngineService().getGlobalFunctions()); mCodeCompletion.setFunctions(readFunctions(getContext(), "js/functions.json"));
} }
public void setEditTextBridge(EditTextBridge editTextBridge) { public void setEditTextBridge(EditTextBridge editTextBridge) {
@@ -124,4 +128,14 @@ public class InputMethodEnhanceBar extends RecyclerView implements CodeCompletio
itemView.setOnLongClickListener(mOnCodeCompletionItemLongClickListener); itemView.setOnLongClickListener(mOnCodeCompletionItemLongClickListener);
} }
} }
private static String[] readFunctions(Context context, String path) {
Gson gson = new Gson();
try {
return gson.fromJson(new InputStreamReader(context.getAssets().open(path)), String[].class);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
} }
@@ -17,28 +17,30 @@ var toast = function(text){
__runtime__.toast(text); __runtime__.toast(text);
} }
var app = __runtime__.app;
var launchPackage = function(package){ var launchPackage = function(package){
__runtime__.app.launchPackage(package); app.launchPackage(package);
} }
var launch = function(a, b){ var launch = function(a, b){
if(arguments.length == 2){ if(arguments.length == 2){
__runtime__.app.launch(a, b); app.launch(a, b);
}else{ }else{
__runtime__.app.launchPackage(a); app.launchPackage(a);
} }
} }
var launchApp = function(appName){ var launchApp = function(appName){
__runtime__.app.launchApp(appName); app.launchApp(appName);
} }
var getPackageName = function(appName){ var getPackageName = function(appName){
return __runtime__.app.getPackageName(appName); return app.getPackageName(appName);
} }
var openAppSetting = function(packageName){ var openAppSetting = function(packageName){
return __runtime__.app.openAppSetting(packageName); return app.openAppSetting(packageName);
} }
@@ -182,6 +184,11 @@ var setClip = function(text){
} }
var SetScreenMetrics = function(w, h){
__runtime__.SetScreenMetrics(w, h);
}
var Tap = function(x, y){ var Tap = function(x, y){
__runtime__.shellExecAsync("input tap " + x + " " + y); __runtime__.shellExecAsync("input tap " + x + " " + y);
} }
@@ -43,9 +43,19 @@ public class ScriptEngineService {
EVENT_BUS.post(new ScriptExecutionEvent(ScriptExecutionEvent.ON_START, execution.getSource().toString())); EVENT_BUS.post(new ScriptExecutionEvent(ScriptExecutionEvent.ON_START, execution.getSource().toString()));
} }
@Override
public void onSuccess(ScriptExecution execution, Object result) {
onFinish(execution);
}
private void onFinish(ScriptExecution execution) {
execution.getRuntime().onStop();
}
@Override @Override
public void onException(ScriptExecution execution, Exception e) { public void onException(ScriptExecution execution, Exception e) {
e.printStackTrace(); e.printStackTrace();
onFinish(execution);
if (!causedByInterrupted(e)) { if (!causedByInterrupted(e)) {
execution.getRuntime().console.error(e.getMessage()); execution.getRuntime().console.error(e.getMessage());
EVENT_BUS.post(new ScriptExecutionEvent(ScriptExecutionEvent.ON_EXCEPTION, e.getMessage())); EVENT_BUS.post(new ScriptExecutionEvent(ScriptExecutionEvent.ON_EXCEPTION, e.getMessage()));
@@ -54,7 +64,7 @@ public class ScriptEngineService {
}; };
private final Supplier<ScriptRuntime> mRuntimeSupplier; private final Supplier<? extends ScriptRuntime> mRuntimeSupplier;
private final Context mContext; private final Context mContext;
private UiHandler mUiHandler; private UiHandler mUiHandler;
private final Console mGlobalConsole; private final Console mGlobalConsole;
@@ -13,7 +13,7 @@ import com.stardust.util.UiHandler;
public class ScriptEngineServiceBuilder { public class ScriptEngineServiceBuilder {
Supplier<ScriptRuntime> mRuntimeSupplier; Supplier<? extends ScriptRuntime> mRuntimeSupplier;
ScriptEngineManager mScriptEngineManager; ScriptEngineManager mScriptEngineManager;
Console mGlobalConsole; Console mGlobalConsole;
UiHandler mUiHandler; UiHandler mUiHandler;
@@ -22,7 +22,7 @@ public class ScriptEngineServiceBuilder {
} }
public ScriptEngineServiceBuilder runtime(Supplier<ScriptRuntime> runtimeSupplier) { public ScriptEngineServiceBuilder runtime(Supplier<? extends ScriptRuntime> runtimeSupplier) {
mRuntimeSupplier = runtimeSupplier; mRuntimeSupplier = runtimeSupplier;
return this; return this;
} }
@@ -102,6 +102,7 @@ public class RhinoJavaScriptEngineManager extends AbstractScriptEngineManager {
ScriptEngine engine = createEngine(); ScriptEngine engine = createEngine();
ScriptSource source = new StringScriptSource("this", "this"); ScriptSource source = new StringScriptSource("this", "this");
engine.setTag("script", source); engine.setTag("script", source);
engine.init();
Scriptable scriptable = (Scriptable) engine.execute(source); Scriptable scriptable = (Scriptable) engine.execute(source);
Object[] ids = scriptable.getIds(); Object[] ids = scriptable.getIds();
String[] functions = new String[ids.length]; String[] functions = new String[ids.length];
@@ -25,15 +25,19 @@ public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecu
@Override @Override
public void run() { public void run() {
mScriptEngine = mScriptEngineService.createScriptEngine(); execute();
mScriptRuntime = mScriptEngineService.createScriptRuntime();
execute(mScriptRuntime, mScriptEngine);
} }
private void execute(ScriptRuntime runtime, ScriptEngine engine) { public Object execute() {
mScriptEngine = mScriptEngineService.createScriptEngine();
mScriptRuntime = mScriptEngineService.createScriptRuntime();
return execute(mScriptRuntime, mScriptEngine);
}
private Object execute(ScriptRuntime runtime, ScriptEngine engine) {
try { try {
prepare(runtime, engine); prepare(runtime, engine);
doExecution(engine); return doExecution(engine);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
getListener().onException(this, e); getListener().onException(this, e);
@@ -41,6 +45,7 @@ public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecu
Log.d(TAG, "Engine destroy"); Log.d(TAG, "Engine destroy");
engine.destroy(); engine.destroy();
} }
return null;
} }
private void prepare(ScriptRuntime runtime, ScriptEngine engine) { private void prepare(ScriptRuntime runtime, ScriptEngine engine) {
@@ -51,10 +56,12 @@ public class RunnableScriptExecution extends ScriptExecution.AbstractScriptExecu
engine.init(); engine.init();
} }
private void doExecution(ScriptEngine engine) { private Object doExecution(ScriptEngine engine) {
engine.setTag("script", getSource()); engine.setTag("script", getSource());
getListener().onStart(this); getListener().onStart(this);
getListener().onSuccess(this, engine.execute(getSource())); Object result = engine.execute(getSource());
getListener().onSuccess(this, result);
return result;
} }
@Override @Override
@@ -14,17 +14,17 @@ import com.stardust.view.accessibility.AccessibilityInfoProvider;
public abstract class AbstractScriptRuntime { public abstract class AbstractScriptRuntime {
@JavascriptField @ScriptVariable
public AppUtils app; public AppUtils app;
@JavascriptField @ScriptVariable
public Console console; public Console console;
@JavascriptField @ScriptVariable
public SimpleActionAutomator automator; public SimpleActionAutomator automator;
@JavascriptField @ScriptVariable
public AccessibilityInfoProvider info; public AccessibilityInfoProvider info;
public AbstractScriptRuntime(AppUtils app, Console console, AccessibilityBridge bridge) { public AbstractScriptRuntime(AppUtils app, Console console, AccessibilityBridge bridge) {
this.app = app; this.app = app;
@@ -36,35 +36,40 @@ public abstract class AbstractScriptRuntime {
public AbstractScriptRuntime() { public AbstractScriptRuntime() {
} }
@JavascriptInterface @ScriptInterface
public abstract void toast(final String text); public abstract void toast(final String text);
@JavascriptInterface @ScriptInterface
public abstract void sleep(long millis); public abstract void sleep(long millis);
@JavascriptInterface @ScriptInterface
public abstract void setClip(final String text); public abstract void setClip(final String text);
@JavascriptInterface @ScriptInterface
public abstract void shellExecAsync(String cmd); public abstract void shellExecAsync(String cmd);
@JavascriptInterface @ScriptInterface
public abstract AbstractShell.Result shell(String cmd, int root); public abstract AbstractShell.Result shell(String cmd, int root);
@JavascriptInterface @ScriptInterface
public abstract UiSelector selector(ScriptEngine engine); public abstract UiSelector selector(ScriptEngine engine);
@JavascriptInterface @ScriptInterface
public abstract boolean isStopped(); public abstract boolean isStopped();
@JavascriptInterface @ScriptInterface
public abstract void requiresApi(int i); public abstract void requiresApi(int i);
@JavascriptInterface @ScriptInterface
public abstract void loadJar(String path); public abstract void loadJar(String path);
@JavascriptInterface @ScriptInterface
public abstract void stop(); public abstract void stop();
@ScriptInterface
public abstract void SetScreenMetrics(int width, int height);
public abstract void ensureAccessibilityServiceEnabled(); public abstract void ensureAccessibilityServiceEnabled();
public abstract void onStop();
} }
@@ -10,5 +10,5 @@ import java.lang.annotation.Target;
*/ */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
public @interface JavascriptClass { public @interface ScriptClass {
} }
@@ -10,5 +10,5 @@ import java.lang.annotation.Target;
*/ */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@Target({ElementType.METHOD}) @Target({ElementType.METHOD})
public @interface JavascriptInterface { public @interface ScriptInterface {
} }
@@ -13,6 +13,7 @@ import com.stardust.pio.UncheckedIOException;
import com.stardust.util.ClipboardUtil; import com.stardust.util.ClipboardUtil;
import com.stardust.autojs.runtime.api.ProcessShell; import com.stardust.autojs.runtime.api.ProcessShell;
import com.stardust.util.SdkVersionUtil; import com.stardust.util.SdkVersionUtil;
import com.stardust.util.Supplier;
import com.stardust.util.UiHandler; import com.stardust.util.UiHandler;
import org.mozilla.javascript.ContextFactory; import org.mozilla.javascript.ContextFactory;
@@ -29,15 +30,69 @@ public class ScriptRuntime extends AbstractScriptRuntime {
private static final String TAG = "ScriptRuntime"; private static final String TAG = "ScriptRuntime";
public static class Builder {
private AppUtils mAppUtils;
private UiHandler mUiHandler;
private Console mConsole;
private AccessibilityBridge mAccessibilityBridge;
private Supplier<AbstractShell> mShellSupplier;
public Builder() {
}
public Builder setAppUtils(AppUtils appUtils) {
mAppUtils = appUtils;
return this;
}
public Builder setUiHandler(UiHandler uiHandler) {
mUiHandler = uiHandler;
return this;
}
public Builder setConsole(Console console) {
mConsole = console;
return this;
}
public Builder setAccessibilityBridge(AccessibilityBridge accessibilityBridge) {
mAccessibilityBridge = accessibilityBridge;
return this;
}
public Builder setShellSupplier(Supplier<AbstractShell> shellSupplier) {
mShellSupplier = shellSupplier;
return this;
}
public ScriptRuntime build() {
return new ScriptRuntime(mAppUtils, mUiHandler, mConsole, mAccessibilityBridge, mShellSupplier);
}
}
private UiHandler mUiHandler; private UiHandler mUiHandler;
private AccessibilityBridge mAccessibilityBridge; private AccessibilityBridge mAccessibilityBridge;
private AbstractShell mRootShell; private AbstractShell mRootShell;
private Supplier<AbstractShell> mShellSupplier;
public ScriptRuntime(UiHandler uiHandler, Console console, AccessibilityBridge accessibilityBridge) {
super(new AppUtils(uiHandler.getContext()), console, accessibilityBridge); protected ScriptRuntime(AppUtils appUtils, UiHandler uiHandler, Console console, AccessibilityBridge accessibilityBridge, Supplier<AbstractShell> shellSupplier) {
super(appUtils, console, accessibilityBridge);
mAccessibilityBridge = accessibilityBridge; mAccessibilityBridge = accessibilityBridge;
mUiHandler = uiHandler; mUiHandler = uiHandler;
mShellSupplier = shellSupplier;
}
public UiHandler getUiHandler() {
return mUiHandler;
}
public AccessibilityBridge getAccessibilityBridge() {
return mAccessibilityBridge;
} }
public void toast(final String text) { public void toast(final String text) {
@@ -62,12 +117,20 @@ public class ScriptRuntime extends AbstractScriptRuntime {
} }
public void shellExecAsync(String cmd) { public void shellExecAsync(String cmd) {
if (mRootShell == null) { ensureRootShell();
mRootShell = new ProcessShell(true);
}
mRootShell.exec(cmd); mRootShell.exec(cmd);
} }
private void ensureRootShell() {
if (mRootShell == null) {
if (mShellSupplier == null) {
throw new ScriptInterruptedException();
}
mRootShell = mShellSupplier.get();
mShellSupplier = null;
}
}
public AbstractShell.Result shell(String cmd, int root) { public AbstractShell.Result shell(String cmd, int root) {
return ProcessShell.execCommand(cmd, root != 0); return ProcessShell.execCommand(cmd, root != 0);
} }
@@ -98,7 +161,22 @@ public class ScriptRuntime extends AbstractScriptRuntime {
Thread.interrupted(); Thread.interrupted();
} }
@Override
public void SetScreenMetrics(int width, int height) {
ensureRootShell();
mRootShell.SetScreenMetrics(width, height);
}
public void ensureAccessibilityServiceEnabled() { public void ensureAccessibilityServiceEnabled() {
mAccessibilityBridge.ensureServiceEnabled(); mAccessibilityBridge.ensureServiceEnabled();
} }
@Override
public void onStop() {
if (mRootShell != null) {
mRootShell.exit();
mRootShell = null;
}
mShellSupplier = null;
}
} }
@@ -0,0 +1,11 @@
package com.stardust.autojs.runtime;
import com.stardust.autojs.runtime.api.AbstractShell;
import com.stardust.autojs.runtime.api.AppUtils;
import com.stardust.autojs.runtime.api.Console;
import com.stardust.util.Supplier;
import com.stardust.util.UiHandler;
public class ScriptRuntimeBuilder {
}
@@ -11,5 +11,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@Target({ElementType.FIELD}) @Target({ElementType.FIELD})
public @interface JavascriptField { public @interface ScriptVariable {
} }
@@ -70,7 +70,7 @@ public abstract class AbstractShell {
exec(TextUtils.join("", new Object[]{"sendevent /dev/input/event", device, " ", type, " ", code, " ", value})); exec(TextUtils.join("", new Object[]{"sendevent /dev/input/event", device, " ", type, " ", code, " ", value}));
} }
public void SetScreenScale(int width, int height){ public void SetScreenMetrics(int width, int height){
mScreenWidth = width; mScreenWidth = width;
mScreenHeight = height; mScreenHeight = height;
} }
@@ -1,10 +1,14 @@
package com.stardust.autojs.runtime.api; package com.stardust.autojs.runtime.api;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri;
import android.support.annotation.Nullable;
import com.stardust.autojs.runtime.JavascriptInterface; import com.stardust.autojs.runtime.ScriptInterface;
import com.stardust.util.IntentUtil; import com.stardust.util.IntentUtil;
import java.util.List; import java.util.List;
@@ -16,13 +20,13 @@ import java.util.List;
public class AppUtils { public class AppUtils {
private Context mContext; private Context mContext;
private Activity mCurrentActivity;
public AppUtils(Context context) { public AppUtils(Context context) {
mContext = context; mContext = context;
} }
@ScriptInterface
@JavascriptInterface
public boolean launchPackage(String packageName) { public boolean launchPackage(String packageName) {
try { try {
PackageManager packageManager = mContext.getPackageManager(); PackageManager packageManager = mContext.getPackageManager();
@@ -34,12 +38,12 @@ public class AppUtils {
} }
@JavascriptInterface @ScriptInterface
public boolean launchApp(String appName) { public boolean launchApp(String appName) {
return launchPackage(getPackageName(appName)); return launchPackage(getPackageName(appName));
} }
@JavascriptInterface @ScriptInterface
public String getPackageName(String appName) { public String getPackageName(String appName) {
PackageManager packageManager = mContext.getPackageManager(); PackageManager packageManager = mContext.getPackageManager();
List<ApplicationInfo> installedApplications = packageManager.getInstalledApplications(PackageManager.GET_META_DATA); List<ApplicationInfo> installedApplications = packageManager.getInstalledApplications(PackageManager.GET_META_DATA);
@@ -51,10 +55,23 @@ public class AppUtils {
return ""; return "";
} }
@JavascriptInterface @ScriptInterface
public boolean openAppSetting(String packageName) { public boolean openAppSetting(String packageName) {
return IntentUtil.goToAppDetailSettings(mContext, packageName); return IntentUtil.goToAppDetailSettings(mContext, packageName);
} }
@Nullable
public Activity getCurrentActivity() {
return mCurrentActivity;
}
@ScriptInterface
public void uninstall(String packageName) {
mContext.startActivity(new Intent(Intent.ACTION_DELETE, Uri.parse("package:" + packageName))
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
}
public void setCurrentActivity(Activity currentActivity) {
mCurrentActivity = currentActivity;
}
} }
@@ -2,7 +2,7 @@ package com.stardust.autojs.runtime.api;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.stardust.autojs.runtime.JavascriptInterface; import com.stardust.autojs.runtime.ScriptInterface;
/** /**
* Created by Stardust on 2017/4/2. * Created by Stardust on 2017/4/2.
@@ -10,31 +10,31 @@ import com.stardust.autojs.runtime.JavascriptInterface;
public interface Console { public interface Console {
@JavascriptInterface @ScriptInterface
void verbose(@Nullable Object data, Object... options); void verbose(@Nullable Object data, Object... options);
@JavascriptInterface @ScriptInterface
void log(@Nullable Object data, Object... options); void log(@Nullable Object data, Object... options);
@JavascriptInterface @ScriptInterface
void info(@Nullable Object data, Object... options); void info(@Nullable Object data, Object... options);
@JavascriptInterface @ScriptInterface
void warn(@Nullable Object data, Object... options); void warn(@Nullable Object data, Object... options);
@JavascriptInterface @ScriptInterface
void error(@Nullable Object data, Object... options); void error(@Nullable Object data, Object... options);
@JavascriptInterface @ScriptInterface
void assertTrue(boolean value, @Nullable Object data, Object... options); void assertTrue(boolean value, @Nullable Object data, Object... options);
@JavascriptInterface @ScriptInterface
void clear(); void clear();
@JavascriptInterface @ScriptInterface
void show(); void show();
@JavascriptInterface @ScriptInterface
void hide(); void hide();
void println(int level, CharSequence charSequence); void println(int level, CharSequence charSequence);
@@ -4,15 +4,15 @@ import android.content.Context;
import android.webkit.ValueCallback; import android.webkit.ValueCallback;
import android.webkit.WebView; import android.webkit.WebView;
import com.stardust.autojs.runtime.JavascriptClass; import com.stardust.autojs.runtime.ScriptClass;
import com.stardust.autojs.runtime.JavascriptInterface; import com.stardust.autojs.runtime.ScriptInterface;
import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.Scriptable;
/** /**
* Created by Stardust on 2017/4/1. * Created by Stardust on 2017/4/1.
*/ */
@JavascriptClass @ScriptClass
public class InjectableWebView extends WebView { public class InjectableWebView extends WebView {
private InjectableWebClient mInjectableWebClient; private InjectableWebClient mInjectableWebClient;
@@ -27,12 +27,12 @@ public class InjectableWebView extends WebView {
setWebViewClient(mInjectableWebClient); setWebViewClient(mInjectableWebClient);
} }
@JavascriptInterface @ScriptInterface
public void inject(String script, ValueCallback<String> callback) { public void inject(String script, ValueCallback<String> callback) {
mInjectableWebClient.inject(script, callback); mInjectableWebClient.inject(script, callback);
} }
@JavascriptInterface @ScriptInterface
public void inject(String script) { public void inject(String script) {
mInjectableWebClient.inject(script); mInjectableWebClient.inject(script);
} }
@@ -7,7 +7,7 @@ import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import com.stardust.autojs.runtime.AccessibilityBridge; import com.stardust.autojs.runtime.AccessibilityBridge;
import com.stardust.autojs.runtime.JavascriptInterface; import com.stardust.autojs.runtime.ScriptInterface;
import com.stardust.autojs.runtime.ScriptInterruptedException; import com.stardust.autojs.runtime.ScriptInterruptedException;
import com.stardust.automator.AccessibilityEventCommandHost; import com.stardust.automator.AccessibilityEventCommandHost;
import com.stardust.automator.ActionArgument; import com.stardust.automator.ActionArgument;
@@ -85,7 +85,7 @@ public class UiSelector extends UiGlobalSelector {
mAllocator = allocator; mAllocator = allocator;
} }
@JavascriptInterface @ScriptInterface
public UiObjectCollection find() { public UiObjectCollection find() {
ensureAccessibilityServiceEnabled(); ensureAccessibilityServiceEnabled();
if (AutomatorConfig.isUnintendedGuardEnabled() && isRunningPackageSelf()) { if (AutomatorConfig.isUnintendedGuardEnabled() && isRunningPackageSelf()) {
@@ -111,7 +111,7 @@ public class UiSelector extends UiGlobalSelector {
} }
@JavascriptInterface @ScriptInterface
@NonNull @NonNull
public UiObjectCollection untilFind() { public UiObjectCollection untilFind() {
UiObjectCollection uiObjectCollection; UiObjectCollection uiObjectCollection;
@@ -125,7 +125,7 @@ public class UiSelector extends UiGlobalSelector {
return uiObjectCollection; return uiObjectCollection;
} }
@JavascriptInterface @ScriptInterface
public UiObject findOne() { public UiObject findOne() {
return untilFindOne(); return untilFindOne();
} }
@@ -136,7 +136,7 @@ public class UiSelector extends UiGlobalSelector {
return new UiObject(collection.get(0).getInfo()); return new UiObject(collection.get(0).getInfo());
} }
@JavascriptInterface @ScriptInterface
public UiSelector id(final String id) { public UiSelector id(final String id) {
if (!id.contains(":")) { if (!id.contains(":")) {
addFilter(new DfsFilter() { addFilter(new DfsFilter() {
@@ -157,131 +157,131 @@ public class UiSelector extends UiGlobalSelector {
return untilFind().performAction(action, arguments); return untilFind().performAction(action, arguments);
} }
@JavascriptInterface @ScriptInterface
public boolean click() { public boolean click() {
return performAction(ACTION_CLICK); return performAction(ACTION_CLICK);
} }
@JavascriptInterface @ScriptInterface
public boolean longClick() { public boolean longClick() {
return performAction(ACTION_LONG_CLICK); return performAction(ACTION_LONG_CLICK);
} }
@JavascriptInterface @ScriptInterface
public boolean accessibilityFocus() { public boolean accessibilityFocus() {
return performAction(ACTION_ACCESSIBILITY_FOCUS); return performAction(ACTION_ACCESSIBILITY_FOCUS);
} }
@JavascriptInterface @ScriptInterface
public boolean clearAccessibilityFocus() { public boolean clearAccessibilityFocus() {
return performAction(ACTION_CLEAR_ACCESSIBILITY_FOCUS); return performAction(ACTION_CLEAR_ACCESSIBILITY_FOCUS);
} }
@JavascriptInterface @ScriptInterface
public boolean focus() { public boolean focus() {
return performAction(ACTION_FOCUS); return performAction(ACTION_FOCUS);
} }
@JavascriptInterface @ScriptInterface
public boolean clearFocus() { public boolean clearFocus() {
return performAction(ACTION_CLEAR_FOCUS); return performAction(ACTION_CLEAR_FOCUS);
} }
@JavascriptInterface @ScriptInterface
public boolean copy() { public boolean copy() {
return performAction(ACTION_COPY); return performAction(ACTION_COPY);
} }
@JavascriptInterface @ScriptInterface
public boolean paste() { public boolean paste() {
return performAction(ACTION_PASTE); return performAction(ACTION_PASTE);
} }
@JavascriptInterface @ScriptInterface
public boolean select() { public boolean select() {
return performAction(ACTION_SELECT); return performAction(ACTION_SELECT);
} }
@JavascriptInterface @ScriptInterface
public boolean cut() { public boolean cut() {
return performAction(ACTION_CUT); return performAction(ACTION_CUT);
} }
@JavascriptInterface @ScriptInterface
public boolean collapse() { public boolean collapse() {
return performAction(ACTION_COLLAPSE); return performAction(ACTION_COLLAPSE);
} }
@JavascriptInterface @ScriptInterface
public boolean expand() { public boolean expand() {
return performAction(ACTION_EXPAND); return performAction(ACTION_EXPAND);
} }
@JavascriptInterface @ScriptInterface
public boolean dismiss() { public boolean dismiss() {
return performAction(ACTION_DISMISS); return performAction(ACTION_DISMISS);
} }
@JavascriptInterface @ScriptInterface
public boolean show() { public boolean show() {
return performAction(ACTION_SHOW_ON_SCREEN.getId()); return performAction(ACTION_SHOW_ON_SCREEN.getId());
} }
@JavascriptInterface @ScriptInterface
public boolean scrollForward() { public boolean scrollForward() {
return performAction(ACTION_SCROLL_FORWARD); return performAction(ACTION_SCROLL_FORWARD);
} }
@JavascriptInterface @ScriptInterface
public boolean scrollBackward() { public boolean scrollBackward() {
return performAction(ACTION_SCROLL_BACKWARD); return performAction(ACTION_SCROLL_BACKWARD);
} }
@JavascriptInterface @ScriptInterface
public boolean scrollUp() { public boolean scrollUp() {
return performAction(ACTION_SCROLL_UP.getId()); return performAction(ACTION_SCROLL_UP.getId());
} }
@JavascriptInterface @ScriptInterface
public boolean scrollDown() { public boolean scrollDown() {
return performAction(ACTION_SCROLL_DOWN.getId()); return performAction(ACTION_SCROLL_DOWN.getId());
} }
@JavascriptInterface @ScriptInterface
public boolean scrollLeft() { public boolean scrollLeft() {
return performAction(ACTION_SCROLL_LEFT.getId()); return performAction(ACTION_SCROLL_LEFT.getId());
} }
@JavascriptInterface @ScriptInterface
public boolean scrollRight() { public boolean scrollRight() {
return performAction(ACTION_SCROLL_RIGHT.getId()); return performAction(ACTION_SCROLL_RIGHT.getId());
} }
@JavascriptInterface @ScriptInterface
public boolean contextClick() { public boolean contextClick() {
return performAction(ACTION_CONTEXT_CLICK.getId()); return performAction(ACTION_CONTEXT_CLICK.getId());
} }
@JavascriptInterface @ScriptInterface
public boolean setSelection(int s, int e) { public boolean setSelection(int s, int e) {
return performAction(ACTION_SET_SELECTION, return performAction(ACTION_SET_SELECTION,
new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_START_INT, s), new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_START_INT, s),
new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_END_INT, e)); new ActionArgument.IntActionArgument(ACTION_ARGUMENT_SELECTION_END_INT, e));
} }
@JavascriptInterface @ScriptInterface
public boolean setText(String text) { public boolean setText(String text) {
return performAction(ACTION_SET_TEXT, return performAction(ACTION_SET_TEXT,
new ActionArgument.CharSequenceActionArgument(ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text)); new ActionArgument.CharSequenceActionArgument(ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE, text));
} }
@JavascriptInterface @ScriptInterface
public boolean setProgress(float value) { public boolean setProgress(float value) {
return performAction(ACTION_SET_PROGRESS.getId(), return performAction(ACTION_SET_PROGRESS.getId(),
new ActionArgument.FloatActionArgument(ACTION_ARGUMENT_PROGRESS_VALUE, value)); new ActionArgument.FloatActionArgument(ACTION_ARGUMENT_PROGRESS_VALUE, value));
} }
@JavascriptInterface @ScriptInterface
public boolean scrollTo(int row, int column) { public boolean scrollTo(int row, int column) {
return performAction(ACTION_SCROLL_TO_POSITION.getId(), return performAction(ACTION_SCROLL_TO_POSITION.getId(),
new ActionArgument.IntActionArgument(ACTION_ARGUMENT_ROW_INT, row), new ActionArgument.IntActionArgument(ACTION_ARGUMENT_ROW_INT, row),
@@ -10,8 +10,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
import com.stardust.autojs.runtime.AbstractScriptRuntime; import com.stardust.autojs.runtime.AbstractScriptRuntime;
import com.stardust.autojs.runtime.AccessibilityBridge; import com.stardust.autojs.runtime.AccessibilityBridge;
import com.stardust.autojs.runtime.JavascriptInterface; import com.stardust.autojs.runtime.ScriptInterface;
import com.stardust.autojs.runtime.ScriptRuntime;
import com.stardust.autojs.runtime.api.AutomatorConfig; import com.stardust.autojs.runtime.api.AutomatorConfig;
import com.stardust.automator.AccessibilityEventCommandHost; import com.stardust.automator.AccessibilityEventCommandHost;
import com.stardust.automator.UiObject; import com.stardust.automator.UiObject;
@@ -53,74 +52,74 @@ public class SimpleActionAutomator {
mScriptRuntime = scriptRuntime; mScriptRuntime = scriptRuntime;
} }
@JavascriptInterface @ScriptInterface
public ActionTarget text(String text, int i) { public ActionTarget text(String text, int i) {
return new ActionTarget.TextActionTarget(text, i); return new ActionTarget.TextActionTarget(text, i);
} }
@JavascriptInterface @ScriptInterface
public ActionTarget bounds(int left, int top, int right, int bottom) { public ActionTarget bounds(int left, int top, int right, int bottom) {
return new ActionTarget.BoundsActionTarget(new Rect(left, top, right, bottom)); return new ActionTarget.BoundsActionTarget(new Rect(left, top, right, bottom));
} }
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@JavascriptInterface @ScriptInterface
public ActionTarget editable(int i) { public ActionTarget editable(int i) {
mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP); mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
return new ActionTarget.EditableActionTarget(i); return new ActionTarget.EditableActionTarget(i);
} }
@JavascriptInterface @ScriptInterface
public ActionTarget id(String id) { public ActionTarget id(String id) {
return new ActionTarget.IdActionTarget(id); return new ActionTarget.IdActionTarget(id);
} }
@JavascriptInterface @ScriptInterface
public boolean click(ActionTarget target) { public boolean click(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_CLICK)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_CLICK));
} }
@JavascriptInterface @ScriptInterface
public boolean longClick(ActionTarget target) { public boolean longClick(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_LONG_CLICK)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_LONG_CLICK));
} }
@JavascriptInterface @ScriptInterface
public boolean scrollUp(ActionTarget target) { public boolean scrollUp(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD));
} }
@JavascriptInterface @ScriptInterface
public boolean scrollDown(ActionTarget target) { public boolean scrollDown(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD));
} }
@JavascriptInterface @ScriptInterface
public boolean scrollBackward(int i) { public boolean scrollBackward(int i) {
return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, i)); return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD, i));
} }
@JavascriptInterface @ScriptInterface
public boolean scrollForward(int i) { public boolean scrollForward(int i) {
return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, i)); return performAction(ActionFactory.createScrollAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD, i));
} }
@JavascriptInterface @ScriptInterface
public boolean scrollMaxBackward() { public boolean scrollMaxBackward() {
return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD)); return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD));
} }
@JavascriptInterface @ScriptInterface
public boolean scrollMaxForward() { public boolean scrollMaxForward() {
return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD)); return performAction(ActionFactory.createScrollMaxAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD));
} }
@JavascriptInterface @ScriptInterface
public boolean focus(ActionTarget target) { public boolean focus(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_FOCUS)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_FOCUS));
} }
@JavascriptInterface @ScriptInterface
public boolean select(ActionTarget target) { public boolean select(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SELECT)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SELECT));
} }
@@ -131,39 +130,39 @@ public class SimpleActionAutomator {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SET_TEXT, text)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SET_TEXT, text));
} }
@JavascriptInterface @ScriptInterface
public boolean back() { public boolean back() {
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK); return performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK);
} }
@JavascriptInterface @ScriptInterface
public boolean home() { public boolean home() {
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_HOME); return performGlobalAction(AccessibilityService.GLOBAL_ACTION_HOME);
} }
@JavascriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public boolean powerDialog() { public boolean powerDialog() {
mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP); mScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP);
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG); return performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG);
} }
@JavascriptInterface @ScriptInterface
public boolean notifications() { public boolean notifications() {
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS); return performGlobalAction(AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS);
} }
@JavascriptInterface @ScriptInterface
public boolean quickSettings() { public boolean quickSettings() {
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS); return performGlobalAction(AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS);
} }
@JavascriptInterface @ScriptInterface
public boolean recents() { public boolean recents() {
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS); return performGlobalAction(AccessibilityService.GLOBAL_ACTION_RECENTS);
} }
@JavascriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.N) @RequiresApi(api = Build.VERSION_CODES.N)
public boolean splitScreen() { public boolean splitScreen() {
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN); return performGlobalAction(AccessibilityService.GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN);
@@ -177,7 +176,7 @@ public class SimpleActionAutomator {
return service.performGlobalAction(action); return service.performGlobalAction(action);
} }
@JavascriptInterface @ScriptInterface
public boolean paste(ActionTarget target) { public boolean paste(ActionTarget target) {
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_PASTE)); return performAction(target.createAction(AccessibilityNodeInfo.ACTION_PASTE));
} }
@@ -0,0 +1,26 @@
package com.stardust.util;
/**
* Created by Stardust on 2017/5/8.
*/
public class ArrayUtils {
public static Integer[] box(int[] array) {
Integer[] box = new Integer[array.length];
for (int i = 0; i < array.length; i++) {
box[i] = array[i];
}
return box;
}
public static int[] unbox(Integer[] array) {
int[] unbox = new int[array.length];
for (int i = 0; i < array.length; i++) {
unbox[i] = array[i];
}
return unbox;
}
}
+25
View File
@@ -0,0 +1,25 @@
import re
def get_functions(path):
list = []
with open(path) as f:
for line in f:
func = get_function_or_null(line)
if func:
list.append(func)
return to_str(list)
def to_str(list):
return str(list).replace("'", '"')
def get_function_or_null(line):
m = re.match(r'^var\s(\S+)\s=', line)
if m and not m.group(1).startswith('__'):
return m.group(1)
else:
return None
if __name__ == "__main__":
print(get_functions(r'autojs\src\main\assets\javascript_engine_init.js'))
print(get_functions(r'app\src\main\assets\js\autojs_init.js'))