From 9f46fa2e54ed8621ce7f777c1007bf52db8fa1e4 Mon Sep 17 00:00:00 2001 From: TonyJiangWJ Date: Thu, 27 Jul 2023 18:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E8=BF=AB=E7=97=87=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=E7=9A=84=E5=8C=85=E5=90=8D?= =?UTF-8?q?auojs=3D>autojs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inrt/build.gradle | 17 +++++++++++++-- inrt/proguard-rules.pro | 4 ---- .../inrt/ExampleInstrumentedTest.java | 2 +- inrt/src/main/AndroidManifest.xml | 21 +++++++++++++------ .../stardust/{auojs => autojs}/inrt/App.kt | 6 +++--- .../{auojs => autojs}/inrt/LogActivity.kt | 6 +++--- .../stardust/{auojs => autojs}/inrt/Pref.kt | 2 +- .../inrt/SettingsActivity.kt | 2 +- .../{auojs => autojs}/inrt/SplashActivity.kt | 6 +++--- .../inrt/autojs/AccessibilityServiceTool.kt | 2 +- .../{auojs => autojs}/inrt/autojs/AutoJs.kt | 10 ++++----- .../inrt/autojs/GlobalKeyObserver.kt | 4 ++-- .../autojs/ScriptExecutionGlobalListener.kt | 4 ++-- .../inrt/autojs/XJavaScriptEngine.kt | 2 +- .../inrt/launch/AssetsProjectLauncher.kt | 12 +++++------ .../inrt/launch/GlobalProjectLauncher.kt | 2 +- .../inrt/ExampleUnitTest.java | 4 +--- 17 files changed, 60 insertions(+), 46 deletions(-) rename inrt/src/androidTest/java/com/stardust/{auojs => autojs}/inrt/ExampleInstrumentedTest.java (95%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/App.kt (95%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/LogActivity.kt (90%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/Pref.kt (98%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/SettingsActivity.kt (97%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/SplashActivity.kt (95%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/autojs/AccessibilityServiceTool.kt (99%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/autojs/AutoJs.kt (95%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/autojs/GlobalKeyObserver.kt (97%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/autojs/ScriptExecutionGlobalListener.kt (93%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/autojs/XJavaScriptEngine.kt (97%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/launch/AssetsProjectLauncher.kt (93%) rename inrt/src/main/java/com/stardust/{auojs => autojs}/inrt/launch/GlobalProjectLauncher.kt (86%) rename inrt/src/test/java/com/stardust/{auojs => autojs}/inrt/ExampleUnitTest.java (92%) diff --git a/inrt/build.gradle b/inrt/build.gradle index 5ff1d96b..1aa0f03f 100644 --- a/inrt/build.gradle +++ b/inrt/build.gradle @@ -1,3 +1,5 @@ +import java.util.regex.Pattern + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' @@ -19,7 +21,7 @@ android { } } defaultConfig { - applicationId "com.stardust.auojs.inrt" + applicationId "com.stardust.autojs.inrt" minSdkVersion versions.mini targetSdkVersion versions.buildApkTarget versionCode versions.appVersionCode - 200 @@ -69,6 +71,17 @@ android { } } +static def inspectSimpleVersion(originalString) { + // 使用正则表达式匹配版本号部分 + def versionPattern = Pattern.compile(/.*(\d+\.\d+\.\d+\.\d+).*/) + def matcher = versionPattern.matcher(originalString) + if (matcher.find()) { + def versionPart = matcher.group(1) + return versionPart + } + return originalString +} + def buildApkPluginForAbi(File pluginProjectDir, String abi) { copy { def fromFile = file('build/outputs/apk/release/') @@ -94,7 +107,7 @@ def buildApkPluginForAbi(File pluginProjectDir, String abi) { into intoFile def fileName = 'app-release.apk' include fileName - rename fileName, '打包插件-' + abi + '-' + versions.appVersionName + '-release.apk' + rename fileName, '打包插件-' + abi + '-' + inspectSimpleVersion(versions.appVersionName) + '.apk' } } diff --git a/inrt/proguard-rules.pro b/inrt/proguard-rules.pro index aa63dce9..49dcc854 100644 --- a/inrt/proguard-rules.pro +++ b/inrt/proguard-rules.pro @@ -27,7 +27,3 @@ -dontwarn org.mozilla.javascript.** -dontwarn jackpal.androidterm.** -keep class org.mozilla.javascript.** { *; } -# Keep all resources in the res/drawable directory --keepclassmembers class com.stardust.auojs.inrt.R$drawable { - public static final int inrt_launcher; -} \ No newline at end of file diff --git a/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java b/inrt/src/androidTest/java/com/stardust/autojs/inrt/ExampleInstrumentedTest.java similarity index 95% rename from inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java rename to inrt/src/androidTest/java/com/stardust/autojs/inrt/ExampleInstrumentedTest.java index 3c731a82..6796e0a0 100644 --- a/inrt/src/androidTest/java/com/stardust/auojs/inrt/ExampleInstrumentedTest.java +++ b/inrt/src/androidTest/java/com/stardust/autojs/inrt/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt; +package com.stardust.autojs.inrt; import android.content.Context; import androidx.test.InstrumentationRegistry; diff --git a/inrt/src/main/AndroidManifest.xml b/inrt/src/main/AndroidManifest.xml index b333c48a..75980d79 100644 --- a/inrt/src/main/AndroidManifest.xml +++ b/inrt/src/main/AndroidManifest.xml @@ -1,10 +1,13 @@ + package="com.stardust.autojs.inrt"> + + @@ -14,6 +17,9 @@ + + + @@ -21,9 +27,12 @@ + + + - + @@ -49,7 +58,7 @@ - + - \ No newline at end of file + diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/App.kt b/inrt/src/main/java/com/stardust/autojs/inrt/App.kt similarity index 95% rename from inrt/src/main/java/com/stardust/auojs/inrt/App.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/App.kt index 3657e87e..2d4a74b8 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/App.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/App.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt +package com.stardust.autojs.inrt import android.app.Application import android.graphics.Bitmap @@ -11,8 +11,8 @@ import com.bumptech.glide.Glide import com.bumptech.glide.request.target.SimpleTarget import com.bumptech.glide.request.transition.Transition import com.stardust.app.GlobalAppContext -import com.stardust.auojs.inrt.autojs.AutoJs -import com.stardust.auojs.inrt.autojs.GlobalKeyObserver +import com.stardust.autojs.inrt.autojs.AutoJs +import com.stardust.autojs.inrt.autojs.GlobalKeyObserver import com.stardust.autojs.core.ui.inflater.ImageLoader import com.stardust.autojs.core.ui.inflater.util.Drawables diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.kt b/inrt/src/main/java/com/stardust/autojs/inrt/LogActivity.kt similarity index 90% rename from inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/LogActivity.kt index 37378525..bb87cd70 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/LogActivity.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/LogActivity.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt +package com.stardust.autojs.inrt import android.content.Intent import android.os.Bundle @@ -8,8 +8,8 @@ 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.GlobalProjectLauncher +import com.stardust.autojs.inrt.autojs.AutoJs +import com.stardust.autojs.inrt.launch.GlobalProjectLauncher import com.stardust.autojs.core.console.ConsoleView import com.stardust.autojs.core.console.ConsoleImpl diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt b/inrt/src/main/java/com/stardust/autojs/inrt/Pref.kt similarity index 98% rename from inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/Pref.kt index f98da2af..126fd582 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/Pref.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/Pref.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt +package com.stardust.autojs.inrt import android.content.Context import android.content.SharedPreferences diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt b/inrt/src/main/java/com/stardust/autojs/inrt/SettingsActivity.kt similarity index 97% rename from inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/SettingsActivity.kt index 02efc172..62769b84 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/SettingsActivity.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/SettingsActivity.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt +package com.stardust.autojs.inrt import android.os.Bundle import androidx.annotation.Nullable diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt b/inrt/src/main/java/com/stardust/autojs/inrt/SplashActivity.kt similarity index 95% rename from inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/SplashActivity.kt index 5705cd2f..7aaea754 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/SplashActivity.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt +package com.stardust.autojs.inrt import android.Manifest import android.content.Intent @@ -13,8 +13,8 @@ import androidx.appcompat.app.AppCompatActivity import android.widget.TextView import android.widget.Toast -import com.stardust.auojs.inrt.autojs.AutoJs -import com.stardust.auojs.inrt.launch.GlobalProjectLauncher +import com.stardust.autojs.inrt.autojs.AutoJs +import com.stardust.autojs.inrt.launch.GlobalProjectLauncher import java.util.ArrayList diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.kt b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/AccessibilityServiceTool.kt similarity index 99% rename from inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/autojs/AccessibilityServiceTool.kt index c61d56d8..bcd2db84 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AccessibilityServiceTool.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/AccessibilityServiceTool.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt.autojs +package com.stardust.autojs.inrt.autojs import android.accessibilityservice.AccessibilityService import android.content.Context diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.kt b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/AutoJs.kt similarity index 95% rename from inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/autojs/AutoJs.kt index 64fda548..6c16111b 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/AutoJs.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/AutoJs.kt @@ -1,13 +1,13 @@ -package com.stardust.auojs.inrt.autojs +package com.stardust.autojs.inrt.autojs import android.annotation.SuppressLint import android.app.Application import android.content.Context import com.stardust.app.GlobalAppContext -import com.stardust.auojs.inrt.LogActivity -import com.stardust.auojs.inrt.Pref -import com.stardust.auojs.inrt.R -import com.stardust.auojs.inrt.SettingsActivity +import com.stardust.autojs.inrt.LogActivity +import com.stardust.autojs.inrt.Pref +import com.stardust.autojs.inrt.R +import com.stardust.autojs.inrt.SettingsActivity import com.stardust.autojs.runtime.ScriptRuntime import com.stardust.autojs.runtime.api.AppUtils import com.stardust.autojs.runtime.exception.ScriptException diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/GlobalKeyObserver.kt similarity index 97% rename from inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/autojs/GlobalKeyObserver.kt index 975c2407..fd00bda4 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/GlobalKeyObserver.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/GlobalKeyObserver.kt @@ -1,10 +1,10 @@ -package com.stardust.auojs.inrt.autojs +package com.stardust.autojs.inrt.autojs import android.util.Log import android.view.KeyEvent import com.stardust.app.GlobalAppContext -import com.stardust.auojs.inrt.Pref +import com.stardust.autojs.inrt.Pref import com.stardust.autojs.core.inputevent.InputEventObserver import com.stardust.autojs.core.inputevent.ShellKeyObserver import com.stardust.view.accessibility.AccessibilityService diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.kt b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/ScriptExecutionGlobalListener.kt similarity index 93% rename from inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/autojs/ScriptExecutionGlobalListener.kt index 753fd97e..217f4139 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/ScriptExecutionGlobalListener.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/ScriptExecutionGlobalListener.kt @@ -1,7 +1,7 @@ -package com.stardust.auojs.inrt.autojs +package com.stardust.autojs.inrt.autojs import com.stardust.app.GlobalAppContext -import com.stardust.auojs.inrt.R +import com.stardust.autojs.inrt.R import com.stardust.autojs.execution.ScriptExecution import com.stardust.autojs.execution.ScriptExecutionListener diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/XJavaScriptEngine.kt b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/XJavaScriptEngine.kt similarity index 97% rename from inrt/src/main/java/com/stardust/auojs/inrt/autojs/XJavaScriptEngine.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/autojs/XJavaScriptEngine.kt index 75e95481..cbd970ed 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/autojs/XJavaScriptEngine.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/autojs/XJavaScriptEngine.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt.autojs +package com.stardust.autojs.inrt.autojs import android.content.Context import com.stardust.autojs.engine.LoopBasedJavaScriptEngine diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt b/inrt/src/main/java/com/stardust/autojs/inrt/launch/AssetsProjectLauncher.kt similarity index 93% rename from inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/launch/AssetsProjectLauncher.kt index 5adbbe31..4d15a5bd 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/launch/AssetsProjectLauncher.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/launch/AssetsProjectLauncher.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt.launch +package com.stardust.autojs.inrt.launch import android.app.Activity import android.content.Context @@ -7,24 +7,22 @@ import android.os.Handler import android.os.Looper import android.text.TextUtils -import com.stardust.auojs.inrt.BuildConfig -import com.stardust.auojs.inrt.LogActivity -import com.stardust.auojs.inrt.Pref -import com.stardust.auojs.inrt.autojs.AutoJs +import com.stardust.autojs.inrt.BuildConfig +import com.stardust.autojs.inrt.LogActivity +import com.stardust.autojs.inrt.Pref +import com.stardust.autojs.inrt.autojs.AutoJs import com.stardust.autojs.engine.encryption.ScriptEncryption import com.stardust.autojs.execution.ExecutionConfig import com.stardust.autojs.execution.ScriptExecution import com.stardust.autojs.project.ProjectConfig import com.stardust.autojs.script.JavaScriptFileSource import com.stardust.autojs.script.JavaScriptSource -import com.stardust.autojs.script.ScriptSource import com.stardust.pio.PFiles import com.stardust.pio.UncheckedIOException import com.stardust.util.MD5 import java.io.File import java.io.IOException -import java.lang.reflect.Field /** * Created by Stardust on 2018/1/24. diff --git a/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.kt b/inrt/src/main/java/com/stardust/autojs/inrt/launch/GlobalProjectLauncher.kt similarity index 86% rename from inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.kt rename to inrt/src/main/java/com/stardust/autojs/inrt/launch/GlobalProjectLauncher.kt index 20742c8c..fed94c1a 100644 --- a/inrt/src/main/java/com/stardust/auojs/inrt/launch/GlobalProjectLauncher.kt +++ b/inrt/src/main/java/com/stardust/autojs/inrt/launch/GlobalProjectLauncher.kt @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt.launch +package com.stardust.autojs.inrt.launch import android.annotation.SuppressLint import com.stardust.app.GlobalAppContext diff --git a/inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java b/inrt/src/test/java/com/stardust/autojs/inrt/ExampleUnitTest.java similarity index 92% rename from inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java rename to inrt/src/test/java/com/stardust/autojs/inrt/ExampleUnitTest.java index 4defcd24..c0522461 100644 --- a/inrt/src/test/java/com/stardust/auojs/inrt/ExampleUnitTest.java +++ b/inrt/src/test/java/com/stardust/autojs/inrt/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.stardust.auojs.inrt; +package com.stardust.autojs.inrt; import com.stardust.util.AdvancedEncryptionStandard; @@ -6,8 +6,6 @@ import org.junit.Test; import java.util.Arrays; -import static org.junit.Assert.*; - /** * Example local unit test, which will execute on the development machine (host). *