From c08363f033fb770d3bc125f101e9ae5c71258e8f Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Sat, 1 Jul 2017 15:09:01 +0800 Subject: [PATCH] make autojs module more independent --- .idea/gradle.xml | 1 + .idea/modules.xml | 1 + app/build.gradle | 5 - app/src/main/AndroidManifest.xml | 27 +-- app/src/main/assets/js/autojs_init.js | 65 ------- .../java/com/stardust/scriptdroid/App.java | 4 - .../stardust/scriptdroid/autojs/AutoJs.java | 47 ++--- .../scriptdroid/autojs/ScriptRuntime.java | 42 ---- .../content/MainMenuNavigatorContent.java | 5 +- .../menu/content/RecordNavigatorContent.java | 4 +- .../layout_inspector/LayoutInspector.java | 5 +- .../record/inputevent/InputEventRecorder.java | 11 +- .../menu/record/inputevent/KeyObserver.java | 17 +- .../menu/record/inputevent/TouchRecorder.java | 6 +- .../service/AccessibilityWatchDogService.java | 122 ------------ .../tool/AccessibilityServiceTool.java | 15 +- .../scriptdroid/ui/console/JraskaConsole.java | 2 +- .../scriptdroid/ui/console/LogActivity.java | 15 +- .../scriptdroid/ui/edit/EditActivity.java | 60 +++--- .../edit/sidemenu/EditSideMenuFragment.java | 8 +- .../scriptdroid/ui/main/MainActivity.java | 82 ++++---- .../scriptdroid/ui/main/SideMenuFragment.java | 19 +- .../ui/settings/AboutActivity.java | 59 +++--- .../ui/settings/SettingsActivity.java | 16 +- app/src/main/res/layout/activity_edit.xml | 1 + .../res/layout/floating_console_expand.xml | 2 +- app/src/main/res/values/strings.xml | 1 - autojs/build.gradle | 6 + autojs/libs/emulatorview-release.aar | Bin 0 -> 94278 bytes autojs/libs/libtermexec-release.aar | Bin 0 -> 33571 bytes autojs/libs/term-debug.aar | Bin 0 -> 334652 bytes autojs/src/main/AndroidManifest.xml | 14 ++ .../src/main/assets/javascript_engine_init.js | 4 +- autojs/src/main/assets/modules/__dialogs__.js | 67 +++++++ .../stardust/autojs/ScriptEngineService.java | 2 + .../autojs/runtime/AbstractScriptRuntime.java | 27 ++- .../runtime/ScriptEnvironmentException.java | 11 ++ .../autojs/runtime/ScriptRuntime.java | 2 +- .../autojs/runtime/api/AbstractShell.java | 7 + .../stardust/autojs/runtime}/api/Shell.java | 28 +-- .../autojs/runtime/api/image/Images.java | 36 +++- .../image}/ScreenCaptureRequestActivity.java | 7 +- .../api/ui}/BlockedMaterialDialog.java | 2 +- .../autojs/runtime/api/ui}/Dialogs.java | 14 +- .../runtime}/console/ConsoleFloaty.java | 6 +- .../autojs/runtime}/console/ConsoleView.java | 6 +- .../runtime}/console/StardustConsole.java | 27 ++- .../res/drawable-hdpi/ic_close_white_24dp.png | Bin .../res/drawable-hdpi/ic_debug_console.png | Bin .../ic_settings_ethernet_white_24dp.png | Bin .../res/drawable-mdpi/ic_close_white_24dp.png | Bin .../res/drawable-mdpi/ic_debug_console.png | Bin .../ic_settings_ethernet_white_24dp.png | Bin .../drawable-xhdpi/ic_close_white_24dp.png | Bin .../res/drawable-xhdpi/ic_debug_console.png | Bin .../ic_settings_ethernet_white_24dp.png | Bin .../drawable-xxhdpi/ic_close_white_24dp.png | Bin .../res/drawable-xxhdpi/ic_debug_console.png | Bin .../ic_settings_ethernet_white_24dp.png | Bin .../drawable-xxxhdpi/ic_close_white_24dp.png | Bin .../res/drawable-xxxhdpi/ic_debug_console.png | Bin .../ic_settings_ethernet_white_24dp.png | Bin .../main/res/drawable/circle_cool_black.xml | 0 .../drawable/floating_console_bg_bottom.xml | 0 .../res/drawable/floating_console_bg_top.xml | 0 .../src/main/res/drawable/ic_move_cursor.png | Bin .../res/drawable/ic_remove_white_24dp.png | Bin .../src/main/res/drawable/ic_resizer.png | Bin .../src/main/res/layout/console_view.xml | 2 +- .../res/layout/floating_console_expand.xml | 106 ++++++++++ .../res/layout/floating_window_collapse.xml | 0 autojs/src/main/res/values/strings.xml | 6 + autojs/src/main/res/values/styles.xml | 8 + .../res/xml/accessibility_service_config.xml | 0 automator/build.gradle | 6 + .../accessibility/AccessibilityService.java | 106 +++++++++- .../AccessibilityServiceUtils.java | 2 + .../app/SimpleActivityLifecycleCallbacks.java | 0 .../stardust/util/FloatingWindowUtils.java | 10 +- inrt/.gitignore | 1 + inrt/build.gradle | 43 +++++ inrt/libs/emulatorview-release.aar | Bin 0 -> 94278 bytes inrt/libs/libtermexec-release.aar | Bin 0 -> 33571 bytes inrt/libs/term-debug.aar | Bin 0 -> 334652 bytes inrt/proguard-rules.pro | 25 +++ .../auojs/inrt/ExampleInstrumentedTest.java | 26 +++ inrt/src/main/AndroidManifest.xml | 22 +++ inrt/src/main/assets/script.js | 5 + .../java/com/stardust/auojs/inrt/App.java | 18 ++ .../com/stardust/auojs/inrt/MainActivity.java | 29 +++ .../inrt/rt/AccessibilityServiceTool.java | 39 ++++ .../com/stardust/auojs/inrt/rt/AutoJs.java | 181 ++++++++++++++++++ inrt/src/main/res/layout/activity_main.xml | 11 ++ inrt/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4208 bytes inrt/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2555 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6114 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10056 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 14696 bytes inrt/src/main/res/values/colors.xml | 6 + inrt/src/main/res/values/strings.xml | 5 + inrt/src/main/res/values/styles.xml | 11 ++ .../stardust/auojs/inrt/ExampleUnitTest.java | 17 ++ settings.gradle | 2 +- 108 files changed, 1085 insertions(+), 510 deletions(-) delete mode 100644 app/src/main/assets/js/autojs_init.js delete mode 100644 app/src/main/java/com/stardust/scriptdroid/autojs/ScriptRuntime.java delete mode 100644 app/src/main/java/com/stardust/scriptdroid/service/AccessibilityWatchDogService.java create mode 100644 autojs/libs/emulatorview-release.aar create mode 100644 autojs/libs/libtermexec-release.aar create mode 100644 autojs/libs/term-debug.aar create mode 100644 autojs/src/main/assets/modules/__dialogs__.js create mode 100644 autojs/src/main/java/com/stardust/autojs/runtime/ScriptEnvironmentException.java rename {app/src/main/java/com/stardust/scriptdroid/autojs => autojs/src/main/java/com/stardust/autojs/runtime}/api/Shell.java (92%) rename {app/src/main/java/com/stardust/scriptdroid/autojs/api => autojs/src/main/java/com/stardust/autojs/runtime/api/image}/ScreenCaptureRequestActivity.java (86%) rename {app/src/main/java/com/stardust/scriptdroid/autojs/api => autojs/src/main/java/com/stardust/autojs/runtime/api/ui}/BlockedMaterialDialog.java (99%) rename {app/src/main/java/com/stardust/scriptdroid/autojs/api => autojs/src/main/java/com/stardust/autojs/runtime/api/ui}/Dialogs.java (91%) rename {app/src/main/java/com/stardust/scriptdroid/ui => autojs/src/main/java/com/stardust/autojs/runtime}/console/ConsoleFloaty.java (97%) rename {app/src/main/java/com/stardust/scriptdroid/ui => autojs/src/main/java/com/stardust/autojs/runtime}/console/ConsoleView.java (97%) rename {app/src/main/java/com/stardust/scriptdroid/ui => autojs/src/main/java/com/stardust/autojs/runtime}/console/StardustConsole.java (86%) rename {app => autojs}/src/main/res/drawable-hdpi/ic_close_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-hdpi/ic_debug_console.png (100%) rename {app => autojs}/src/main/res/drawable-hdpi/ic_settings_ethernet_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-mdpi/ic_close_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-mdpi/ic_debug_console.png (100%) rename {app => autojs}/src/main/res/drawable-mdpi/ic_settings_ethernet_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-xhdpi/ic_close_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-xhdpi/ic_debug_console.png (100%) rename {app => autojs}/src/main/res/drawable-xhdpi/ic_settings_ethernet_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-xxhdpi/ic_debug_console.png (100%) rename {app => autojs}/src/main/res/drawable-xxhdpi/ic_settings_ethernet_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable-xxxhdpi/ic_debug_console.png (100%) rename {app => autojs}/src/main/res/drawable-xxxhdpi/ic_settings_ethernet_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable/circle_cool_black.xml (100%) rename {app => autojs}/src/main/res/drawable/floating_console_bg_bottom.xml (100%) rename {app => autojs}/src/main/res/drawable/floating_console_bg_top.xml (100%) rename {app => autojs}/src/main/res/drawable/ic_move_cursor.png (100%) rename {app => autojs}/src/main/res/drawable/ic_remove_white_24dp.png (100%) rename {app => autojs}/src/main/res/drawable/ic_resizer.png (100%) rename {app => autojs}/src/main/res/layout/console_view.xml (97%) create mode 100644 autojs/src/main/res/layout/floating_console_expand.xml rename {app => autojs}/src/main/res/layout/floating_window_collapse.xml (100%) create mode 100644 autojs/src/main/res/values/styles.xml rename {app => autojs}/src/main/res/xml/accessibility_service_config.xml (100%) rename {app => common}/src/main/java/com/stardust/app/SimpleActivityLifecycleCallbacks.java (100%) create mode 100644 inrt/.gitignore create mode 100644 inrt/build.gradle create mode 100644 inrt/libs/emulatorview-release.aar create mode 100644 inrt/libs/libtermexec-release.aar create mode 100644 inrt/libs/term-debug.aar create mode 100644 inrt/proguard-rules.pro create mode 100644 inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java create mode 100644 inrt/src/main/AndroidManifest.xml create mode 100644 inrt/src/main/assets/script.js create mode 100644 inrt/src/main/java/com/stardust/auojs/inrt/App.java create mode 100644 inrt/src/main/java/com/stardust/auojs/inrt/MainActivity.java create mode 100644 inrt/src/main/java/com/stardust/auojs/inrt/rt/AccessibilityServiceTool.java create mode 100644 inrt/src/main/java/com/stardust/auojs/inrt/rt/AutoJs.java create mode 100644 inrt/src/main/res/layout/activity_main.xml create mode 100644 inrt/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 inrt/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 inrt/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 inrt/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 inrt/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 inrt/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 inrt/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 inrt/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 inrt/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 inrt/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 inrt/src/main/res/values/colors.xml create mode 100644 inrt/src/main/res/values/strings.xml create mode 100644 inrt/src/main/res/values/styles.xml create mode 100644 inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d1f39408..ae3cf381 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,6 +12,7 @@