just to save some fucking works

This commit is contained in:
hyb1996
2017-05-14 19:46:51 +08:00
parent a4c6eb6cee
commit 36ef8c8396
22 changed files with 491 additions and 258 deletions

View File

@@ -70,10 +70,10 @@ public class AutoJs implements AccessibilityBridge {
.uiHandler(mUiHandler)
.globalConsole(new JraskaConsole())
.engineManger(manager)
.runtime(new Supplier<ScriptRuntime>() {
.runtime(new Supplier<com.stardust.autojs.runtime.ScriptRuntime>() {
@Override
public ScriptRuntime get() {
public com.stardust.autojs.runtime.ScriptRuntime get() {
return new ScriptRuntime.Builder()
.setAppUtils(mAppUtils)
.setConsole(new StardustConsole(mUiHandler))

View File

@@ -16,45 +16,16 @@ import com.stardust.util.UiHandler;
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 static class Builder extends com.stardust.autojs.runtime.ScriptRuntime.Builder {
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);
return new ScriptRuntime(this);
}
}
@@ -62,9 +33,9 @@ public class ScriptRuntime extends com.stardust.autojs.runtime.ScriptRuntime {
@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);
private ScriptRuntime(Builder builder) {
super(builder);
dialogs = new Dialogs(app, getUiHandler());
}

View File

@@ -101,7 +101,7 @@ public class InputEventToJsConverter extends InputEventConverter {
private class KeyHandler implements EventHandler {
private Map<String, String> mKeyPressCodeMap = new MapEntries<>(new HashMap<String, String>())
private Map<String, String> mKeyPressCodeMap = new MapEntries<String, String>()
.entry("KEY_HOME", "Home")
.entry("KEY_MENU", "Menu")
.entry("KEY_VOLUMEDOWN", "VolumeDown")