6.0.1 - 增加客户端/服务端连接方式 增加部分全局对象 部分插件及工具版本更新

inrt/build.gradle

@@ -1,5 +1,5 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.application"
+apply plugin: "kotlin-android"
 
 android {
     compileSdkVersion versions.compile
@@ -15,8 +15,8 @@ android {
     }
     lintOptions {
         abortOnError false
-        disable 'MissingTranslation'
-        disable 'ExtraTranslation'
+        disable "MissingTranslation"
+        disable "ExtraTranslation"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_16
@@ -46,51 +46,51 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 }
 
 def buildApkPluginForAbi(File pluginProjectDir, String abi) {
     copy {
-        from file('..\\app\\release\\')
-        into new File(pluginProjectDir, 'app\\src\\main\\assets')
+        from file("..\\app\\release\\")
+        into new File(pluginProjectDir, "app\\src\\main\\assets")
         def fileName = "inrt-" + abi + "-release.apk"
         include fileName
-        rename fileName, 'template.apk'
+        rename fileName, "template.apk"
     }
     exec {
         workingDir pluginProjectDir
-        commandLine 'gradlew.bat', 'assembleRelease'
+        commandLine "gradlew.bat", "assembleRelease"
     }
     copy {
-        from new File(pluginProjectDir, 'app\\build\\outputs\\apk\\release')
-        into file('..\\common\\release')
-        def fileName = '打包插件-' + versions.appVersionName + '-release.apk'
+        from new File(pluginProjectDir, "app\\build\\outputs\\apk\\release")
+        into file("..\\common\\release")
+        def fileName = "打包插件-" + versions.appVersionName + "-release.apk"
         include fileName
-        rename fileName, '打包插件-' + abi + '-' + versions.appVersionName + '-release.apk'
+        rename fileName, "打包插件-" + abi + "-" + versions.appVersionName + "-release.apk"
     }
 }
 
 task buildApkPlugin {
     doLast {
-        def pluginProjectDirPath = '..\\..\\AutoJsApkBuilderPlugin'
+        def pluginProjectDirPath = "..\\..\\AutoJsApkBuilderPlugin"
         def pluginProjectDir = file(pluginProjectDirPath)
         if (!pluginProjectDir.exists() || !pluginProjectDir.isDirectory()) {
-            println 'pluginProjectDir not exists'
+            println "pluginProjectDir not exists"
             return
         }
-        buildApkPluginForAbi(pluginProjectDir, 'armeabi-v7a')
+        buildApkPluginForAbi(pluginProjectDir, "armeabi-v7a")
     }
 }
 
 tasks.whenTaskAdded { task ->
-    if (task.name == 'assembleRelease') {
-        task.finalizedBy 'buildApkPlugin'
+    if (task.name == "assembleRelease") {
+        task.finalizedBy "buildApkPlugin"
     }
 }
 
@@ -105,14 +105,14 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation "junit:junit:${junitVer}"
 
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation "com.github.bumptech.glide:glide:4.12.0"
 
     implementation project(":libs:org.mozilla.rhino-1.7.14")
     implementation project(":libs:org.opencv-4.5.4")
 
-    implementation project(':automator')
-    implementation project(':common')
-    implementation project(':autojs')
+    implementation project(":automator")
+    implementation project(":common")
+    implementation project(":autojs")
 }

inrt/src/main/res/values/strings.xml

@@ -19,6 +19,6 @@
     <string name="summary_not_show_main_activity">打开应用后直接运行脚本</string>
     <string name="text_others">其他</string>
     <string name="powered_by_autojs">Powered by Auto.js</string>
-    <string name="text_execution_finished" formatted="false">\n------------\n[%s]运行结束，用时%f秒</string>
+    <string name="text_execution_finished" formatted="false">[%s] 运行结束 (用时 %f 秒)</string>
 
 </resources>