diff --git a/README.md b/README.md index c3b529fe6..4efdd9966 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ [Auto.js](https://github.com/hyb1996/Auto.js) 是一款 Android 平台支持 [无障碍服务](https://developer.android.com/guide/topics/ui/accessibility/service?hl=zh-cn) 的 JavaScript 自动化工具软件. -Auto.js 由 [hyb1996](https://github.com/hyb1996) 于 `2017/01/27` 初次发布, 于 `2020/03/13` 停止维护, 最终版本名称为 `4.1.1 alpha2`. +Auto.js 由 [hyb1996](https://github.com/hyb1996) 于 `2017/01/27` 初次发布, 于 `2020/03/13` 停止维护, 最终版本名称为 `4.1.1 Alpha2`, 构建版本号为 `461`. AutoJs6 在 Auto.js 最终项目的基础上, 于 `2021/12/01` 进行二次开发, 继续保持开源免费. @@ -131,6 +131,25 @@ AutoJs6 在 Auto.js 最终项目的基础上, 于 `2021/12/01` 进行二次开 [comment]: <> "Version history only shows last 3 versions" +# v6.4.2 + +###### 2023/11/15 + +* `新增` dialogs.build() 选项参数属性 inputSingleLine +* `新增` console.setTouchable 方法 _[`issue #122`](http://issues.autojs6.com/122)_ +* `修复` ocr 模块部分方法无法识别区域参数的问题 _[`issue #162`](http://issues.autojs6.com/162)_ _[`issue #175`](http://issues.autojs6.com/175)_ +* `修复` Android 7.x 发现新版本时无法获取版本详情的问题 +* `修复` Android 14 申请截图权限时导致应用崩溃的问题 +* `修复` 主页抽屉快速切换 "浮动按钮" 开关时可能导致应用崩溃的问题 +* `修复` 使用菜单关闭浮动按钮时重启应用后浮动按钮可能依然显示的问题 +* `修复` 安卓 13 及以上系统设置页面选择并切换 AutoJs6 语言后无法生效的问题 +* `修复` 构建工具初次构建时无法自动完成 OpenCV 资源部署的问题 +* `优化` 原生化 bridges 模块以提升脚本执行效率 (Ref to [aiselp](https://github.com/aiselp/AutoX/commit/7c41af6d2b9b36d00440a9c8b7e971d025f98327)) +* `优化` 重构无障碍服务相关代码以增强无障碍服务的功能稳定性 (实验性) _[`issue #167`](http://issues.autojs6.com/167)_ +* `优化` UiObject 和 UiObjectCollection 的打印输出格式 +* `优化` 构建工具在构建环境 Gradle JDK 版本不满足要求时作出升级提示 +* `优化` 部分依赖或本地库版本调整 _[`CHANGELOG.md`](http://project.autojs6.com/blob/master/app/src/main/assets/doc/CHANGELOG.md#v642)_ + # v6.4.1 ###### 2023/11/02 @@ -192,27 +211,6 @@ AutoJs6 在 Auto.js 最终项目的基础上, 于 `2021/12/01` 进行二次开 * `优化` 适配 VSCode 插件 1.0.7 * `优化` 部分依赖或本地库版本调整 _[`CHANGELOG.md`](http://project.autojs6.com/blob/master/app/src/main/assets/doc/CHANGELOG.md#v640)_ -# v6.3.3 - -###### 2023/07/21 - -* `新增` 代码编辑器的代码注释功能 (by [抠脚本人](https://github.com/little-alei)) _[`pr #98`](http://pr.autojs6.com/98)_ -* `新增` auto.stateListener 用于无障碍服务连接状态监听 (by [抠脚本人](https://github.com/little-alei)) _[`pr #98`](http://pr.autojs6.com/98)_ -* `新增` UiObject 类型添加 nextSibling / lastChild / offset 等方法 (参阅 项目文档 > [控件节点](https://docs.autojs6.com/#/uiObjectType)) -* `修复` VSCode 插件在脚本字符总长度超过四位十进制数时无法解析数据的问题 _[`issue #91`](http://issues.autojs6.com/91)_ _[`issue #93`](http://issues.autojs6.com/93)_ _[`issue #100`](http://issues.autojs6.com/100)_ _[`issue #109`](http://issues.autojs6.com/109)_ -* `修复` VSCode 插件无法正常保存文件的问题 _[`issue #92`](http://issues.autojs6.com/91)_ _[`issue #94`](http://issues.autojs6.com/93)_ -* `修复` 浮动按钮菜单项 "管理无障碍服务" 点击后可能未发生页面跳转的问题 -* `修复` runtime.requestPermissions 方法丢失的问题 _[`issue #104`](http://issues.autojs6.com/104)_ -* `修复` events.emitter 不支持 MainThreadProxy 参数的问题 _[`issue #103`](http://issues.autojs6.com/103)_ -* `修复` 在 _[`pr #78`](http://pr.autojs6.com/78)_ 中存在的代码编辑器无法格式化代码的问题 -* `修复` 使用 JavaAdapter 时导致 ClassLoader 调用栈溢出的问题 _[`issue #99`](http://issues.autojs6.com/99)_ _[`issue #110`](http://issues.autojs6.com/110)_ -* `优化` 调整模块作用域 (by [aiselp](https://github.com/aiselp)) _[`pr #75`](http://pr.autojs6.com/75)_ _[`pr #78`](http://pr.autojs6.com/78)_ -* `优化` 移除发行版本应用启动时的签名校验 (by [LZX284](https://github.com/LZX284)) _[`pr #81`](http://pr.autojs6.com/81)_ -* `优化` 在 _[`pr #98`](http://pr.autojs6.com/98)_ 基础上的编辑器代码注释功能的行为, 样式及光标位置处理 -* `优化` 在 _[`pr #98`](http://pr.autojs6.com/98)_ 基础上添加代码注释菜单项 -* `优化` 适配 VSCode 插件 1.0.6 -* `优化` UiObject#parent 方法增加级数参数支持 (参阅 项目文档 > [控件节点](https://docs.autojs6.com/#/uiObjectType)) - ##### 更多版本历史可参阅 * [CHANGELOG.md](http://changelog.autojs6.com) @@ -229,12 +227,12 @@ AutoJs6 在 Auto.js 最终项目的基础上, 于 `2021/12/01` 进行二次开 #### Android Studio 准备 -下载 `Android Studio Hedgehog | 2023.1.1 RC 2` 版本 (按需选择其一): +下载 `Android Studio Hedgehog | 2023.1.1 RC 3` 版本 (按需选择其一): -- [android-studio-2023.1.1.24-windows.exe](https://redirector.gvt1.com/edgedl/android/studio/install/2023.1.1.24/android-studio-2023.1.1.24-windows.exe) (1.1 GB) -- [android-studio-2023.1.1.24-windows.zip](https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.1.1.24/android-studio-2023.1.1.24-windows.zip) (1.1 GB) +- [android-studio-2023.1.1.25-windows.exe](https://redirector.gvt1.com/edgedl/android/studio/install/2023.1.1.25/android-studio-2023.1.1.25-windows.exe) (1.1 GB) +- [android-studio-2023.1.1.25-windows.zip](https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.1.1.25/android-studio-2023.1.1.25-windows.zip) (1.1 GB) -> 注: 上述版本发布时间为 2023 年 10 月 30 日. 如需下载其他版本, 或上述链接已失效, 可访问 [Android Studio 发行版本归档](https://developer.android.com/studio/archive?hl=en) 页面. +> 注: 上述版本发布时间为 2023 年 11 月 9 日. 如需下载其他版本, 或上述链接已失效, 可访问 [Android Studio 发行版本归档](https://developer.android.com/studio/archive?hl=en) 页面. 安装或解压上述文件, 运行 Android Studio 软件 (如 `"D:\android-studio\bin\studio64.exe"`). @@ -401,11 +399,12 @@ Gradle - Update badges like [ android studio / rhino / ... ] - Update android studio download links and version names - Remove the part like [ alpha / beta / ... ] of VERSION_NAME in version.properties - - Update dependencies information for Android Gradle Plugin in the top-level build.gradle.kts - - Update dependencies TypeScript declarations. + - Update dependencies TypeScript declarations if needed. - Re-generate documentation by running the python script - Check the two-way versions for AutoJs6 and VSCode ext, then publish the ext to Microsoft - Run Gradle task "app:assembleInrtRelease" - Build APK to determine the final VERSION_BUILD field + - Run Gradle task "app:appendDigestToReleasedFiles" - Commit and push to GitHub + - Publish the latest release with signed APKs ) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2b446eb2b..79158a854 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -178,7 +178,7 @@ dependencies /* AppCompat */ { // implementation("androidx.appcompat:appcompat") { // version { // strictly("1.4.2") - // because("version 1.5.0 duplicates some classes") + // because("Version 1.5.0 duplicates some classes") // } // } // @@ -200,7 +200,7 @@ dependencies /* Material Dialogs */ { val configuration: (ExternalModuleDependency).() -> Unit = { version { prefer("0.9.6.0") - because("not ready to update to version 3.3.0 yet") + because("Not ready to update to version 3.3.0 yet") } } configuration.let { @@ -234,18 +234,24 @@ dependencies /* View */ { dependencies /* GitHub API */ { implementation(files("$rootDir/libs/github-api-1.306.jar")) - implementation("commons-io:commons-io:2.14.0") + implementation("commons-io:commons-io") { + because("Compatibility for Android API Level < 26 (Android 8.0) [O]") + version { + strictly("2.8.0") + because("Exception on newer versions: 'NoClassDefFoundError: org.apache.commons.io.IOUtils'") + } + } implementation("com.fasterxml.jackson.core:jackson-databind") { - because("compatibility for Android API Level < 26 (Android 8.0) [O]") - version /* as of Oct 12, 2023 */ { - strictly("2.14.3") - because("Exception on 2.15.x: 'IllegalArgumentException: Unsupported class file major version 63'") + because("Compatibility for Android API Level < 26 (Android 8.0) [O]") + version { + strictly("2.13.3") + because("Exception on 2.14.x: 'No virtual method getParameterCount()I in class Ljava/lang/reflect/Method'") } } coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3") { - because("compatibility of java.time.* for Android API Level < 26 (Android 8.0) [O]") + because("Compatibility of java.time.* for Android API Level < 26 (Android 8.0) [O]") } } @@ -488,22 +494,13 @@ android { javaCompileOptions { annotationProcessorOptions { mapOf( - "resourcePackageName" to (this@defaultConfig.applicationId - ?: this@Build_gradle.applicationId), + "resourcePackageName" to (this@defaultConfig.applicationId ?: this@Build_gradle.applicationId), "androidManifestFile" to ("$projectDir/src/main/AndroidManifest.xml") ).let { arguments(it) } } } - buildConfigField( - "String", - "VERSION_DATE", - "\"${Utils.getDateString("MMM d, yyyy", "GMT+08:00")}\"" - ) - buildConfigField( - "String", - "VSCODE_EXT_REQUIRED_VERSION", - "\"${versions.vscodeExtRequiredVersion}\"" - ) + buildConfigField("String", "VERSION_DATE", "\"${Utils.getDateString("MMM d, yyyy", "GMT+08:00")}\"") + buildConfigField("String", "VSCODE_EXT_REQUIRED_VERSION", "\"${versions.vscodeExtRequiredVersion}\"") } applicationVariants.all { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7c364f7e8..8302770ca 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ + android:required="false" /> - + - + - + + + + tools:ignore="ProtectedPermissions" /> + tools:ignore="QueryAllPackagesPermission" /> + tools:ignore="ProtectedPermissions" /> + tools:ignore="ProtectedPermissions" /> + tools:ignore="ProtectedPermissions" /> - + - + - + - + - + - + @@ -137,9 +137,13 @@ tools:ignore="DataExtractionRules" tools:targetApi="tiramisu"> + + + android:value="${CHANNEL}" /> - - - - - + + + + + android:resource="@xml/app_shortcuts" /> + android:theme="@style/AppTheme.FullScreen" /> - + - + @@ -189,7 +192,7 @@ android:grantUriPermissions="true"> + android:resource="@xml/provider_paths" /> + android:theme="@style/EditorTheme" /> + android:theme="@style/AppTheme.Settings" /> + android:label="@string/text_app_shortcut_settings_long_label" + android:theme="@style/AppTheme.Settings" /> + android:theme="@style/AppTheme.Settings" /> - + + android:configChanges="orientation|keyboardHidden|screenSize|locale" /> + android:configChanges="orientation|keyboardHidden|screenSize|locale" /> - + + android:exported="true" + android:label="@string/text_app_shortcut_log_long_label" + android:taskAffinity="org.autojs.autojs.ui.log.LogActivity" + android:launchMode="singleTop" /> - + - + - + - + + android:theme="@style/AppTheme.Transparent" /> - + - + - + - + - + - + - + + android:value="true" /> - + @@ -304,10 +316,10 @@ + android:value="true" /> - + @@ -321,7 +333,7 @@ tools:ignore="ExportedActivity"> - + @@ -332,71 +344,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + tools:ignore="BatteryLife" /> - + - + - + - + - + - + @@ -411,7 +423,7 @@ - + @@ -423,21 +435,21 @@ android:label="@string/text_edit_script"> - + - + - + - + - + - + - + - + @@ -451,21 +463,21 @@ android:theme="@android:style/Theme.NoDisplay"> - + - + - + - + - + - + - + - + @@ -478,21 +490,21 @@ android:theme="@style/AppTheme.Transparent"> - + - + - + - + - + - + - + - + @@ -503,7 +515,7 @@ android:label="@string/app_name" android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"> - + @@ -512,12 +524,12 @@ android:exported="false"> - + + android:resource="@xml/script_widget_config" /> @@ -525,7 +537,7 @@ android:name="org.autojs.autojs.timing.TaskReceiver" android:exported="false"> - + @@ -541,24 +553,24 @@ + android:theme="@style/MtAppTheme.FullScreen" /> + android:theme="@style/ScriptTheme" /> + android:theme="@style/ScriptTheme.Transparent" /> + android:theme="@style/ScriptTheme.Transparent" /> - + + android:resource="@xml/accessibility_service_config" /> - - - + android:exported="false" + android:foregroundServiceType="mediaProjection" /> + android:value="true" /> - + - + @@ -615,15 +619,18 @@ android:name="org.autojs.autojs.inrt.LogActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> - + + + android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" /> \ No newline at end of file diff --git a/app/src/main/assets/doc/CHANGELOG.md b/app/src/main/assets/doc/CHANGELOG.md index 3767563bc..006fc8ba2 100644 --- a/app/src/main/assets/doc/CHANGELOG.md +++ b/app/src/main/assets/doc/CHANGELOG.md @@ -4,6 +4,27 @@ ****** +# v6.4.2 + +###### 2023/11/15 + +* `新增` dialogs.build() 选项参数属性 inputSingleLine +* `新增` console.setTouchable 方法 _[`issue #122`](http://issues.autojs6.com/122)_ +* `修复` ocr 模块部分方法无法识别区域参数的问题 _[`issue #162`](http://issues.autojs6.com/162)_ _[`issue #175`](http://issues.autojs6.com/175)_ +* `修复` Android 7.x 发现新版本时无法获取版本详情的问题 +* `修复` Android 14 申请截图权限时导致应用崩溃的问题 +* `修复` 主页抽屉快速切换 "浮动按钮" 开关时可能导致应用崩溃的问题 +* `修复` 使用菜单关闭浮动按钮时重启应用后浮动按钮可能依然显示的问题 +* `修复` 安卓 13 及以上系统设置页面选择并切换 AutoJs6 语言后无法生效的问题 +* `修复` 构建工具初次构建时无法自动完成 OpenCV 资源部署的问题 +* `优化` 原生化 bridges 模块以提升脚本执行效率 (Ref to [aiselp](https://github.com/aiselp/AutoX/commit/7c41af6d2b9b36d00440a9c8b7e971d025f98327)) +* `优化` 重构无障碍服务相关代码以增强无障碍服务的功能稳定性 (实验性) _[`issue #167`](http://issues.autojs6.com/167)_ +* `优化` UiObject 和 UiObjectCollection 的打印输出格式 +* `优化` 构建工具在构建环境 Gradle JDK 版本不满足要求时作出升级提示 +* `依赖` 升级 Gradle 版本 8.4 -> 8.5-rc-1 +* `依赖` 降级 Commons IO 版本 2.14.0 -> 2.8.0 +* `依赖` 降级 Jackson DataBind 版本 2.14.3 -> 2.13.3 + # v6.4.1 ###### 2023/11/02 @@ -22,6 +43,7 @@ * `优化` http 模块获取的响应对象可重复使用 body.string() 及 body.bytes() 方法 * `优化` 增加 GitHub Actions 自动打包支持 (by [TonyJiangWJ](https://github.com/TonyJiangWJ)) _[`pr #158`](http://pr.autojs6.com/158)_ * `优化` 构建工具自适应 Temurin 平台 +* `依赖` 升级 Gradle 版本 8.4-rc-3 -> 8.4 * `依赖` 升级 Android dx 版本 1.11 -> 1.14 # v6.4.0 diff --git a/app/src/main/assets/docs/404.html b/app/src/main/assets/docs/404.html index 5906a8298..65dc33883 100644 --- a/app/src/main/assets/docs/404.html +++ b/app/src/main/assets/docs/404.html @@ -2,7 +2,7 @@ - 页面不存在 | AutoJs6 文档 - 6.4.1 + 页面不存在 | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@
-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/activity.html b/app/src/main/assets/docs/activity.html index aeb686398..644838fa8 100644 --- a/app/src/main/assets/docs/activity.html +++ b/app/src/main/assets/docs/activity.html @@ -2,7 +2,7 @@ - 活动 (Activity) | AutoJs6 文档 - 6.4.1 + 活动 (Activity) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/all.html b/app/src/main/assets/docs/all.html index 188d441d2..d767f4db2 100644 --- a/app/src/main/assets/docs/all.html +++ b/app/src/main/assets/docs/all.html @@ -2,7 +2,7 @@ - 综述 (Overview) | AutoJs6 文档 - 6.4.1 + 综述 (Overview) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/androidBundleType.html b/app/src/main/assets/docs/androidBundleType.html index 08a39f495..638973fdb 100644 --- a/app/src/main/assets/docs/androidBundleType.html +++ b/app/src/main/assets/docs/androidBundleType.html @@ -2,7 +2,7 @@ - AndroidBundle | AutoJs6 文档 - 6.4.1 + AndroidBundle | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/androidRectType.html b/app/src/main/assets/docs/androidRectType.html index 054403c2f..a45d21baa 100644 --- a/app/src/main/assets/docs/androidRectType.html +++ b/app/src/main/assets/docs/androidRectType.html @@ -2,7 +2,7 @@ - AndroidRect | AutoJs6 文档 - 6.4.1 + AndroidRect | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/apiLevel.html b/app/src/main/assets/docs/apiLevel.html index a59dc4d63..4221e8113 100644 --- a/app/src/main/assets/docs/apiLevel.html +++ b/app/src/main/assets/docs/apiLevel.html @@ -2,7 +2,7 @@ - 安卓 API 级别 (Android API Level) | AutoJs6 文档 - 6.4.1 + 安卓 API 级别 (Android API Level) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/app.html b/app/src/main/assets/docs/app.html index 9a94afdf6..ec56e2212 100644 --- a/app/src/main/assets/docs/app.html +++ b/app/src/main/assets/docs/app.html @@ -2,7 +2,7 @@ - 通用应用 (App) | AutoJs6 文档 - 6.4.1 + 通用应用 (App) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/appType.html b/app/src/main/assets/docs/appType.html index 408640fe9..e92ae7c20 100644 --- a/app/src/main/assets/docs/appType.html +++ b/app/src/main/assets/docs/appType.html @@ -2,7 +2,7 @@ - 应用枚举类 (App) | AutoJs6 文档 - 6.4.1 + 应用枚举类 (App) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/arrayx.html b/app/src/main/assets/docs/arrayx.html index 1d9986cfd..51f54bcb4 100644 --- a/app/src/main/assets/docs/arrayx.html +++ b/app/src/main/assets/docs/arrayx.html @@ -2,7 +2,7 @@ - Arrayx (Array 扩展) | AutoJs6 文档 - 6.4.1 + Arrayx (Array 扩展) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/autojs.html b/app/src/main/assets/docs/autojs.html index c2752c13e..952934d3f 100644 --- a/app/src/main/assets/docs/autojs.html +++ b/app/src/main/assets/docs/autojs.html @@ -2,7 +2,7 @@ - AutoJs6 本体应用 | AutoJs6 文档 - 6.4.1 + AutoJs6 本体应用 | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/automator.html b/app/src/main/assets/docs/automator.html index 93a02f054..22e854489 100644 --- a/app/src/main/assets/docs/automator.html +++ b/app/src/main/assets/docs/automator.html @@ -2,7 +2,7 @@ - 自动化 (Automator) | AutoJs6 文档 - 6.4.1 + 自动化 (Automator) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/barcode.html b/app/src/main/assets/docs/barcode.html index 1a152c2c1..6030b91e4 100644 --- a/app/src/main/assets/docs/barcode.html +++ b/app/src/main/assets/docs/barcode.html @@ -2,7 +2,7 @@ - 条码 (Barcode) | AutoJs6 文档 - 6.4.1 + 条码 (Barcode) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/base64.html b/app/src/main/assets/docs/base64.html index a3c78e81b..be040303e 100644 --- a/app/src/main/assets/docs/base64.html +++ b/app/src/main/assets/docs/base64.html @@ -2,7 +2,7 @@ - Base64 | AutoJs6 文档 - 6.4.1 + Base64 | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/canvas.html b/app/src/main/assets/docs/canvas.html index d3b402646..5c74d4438 100644 --- a/app/src/main/assets/docs/canvas.html +++ b/app/src/main/assets/docs/canvas.html @@ -2,7 +2,7 @@ - 画布 (Canvas) | AutoJs6 文档 - 6.4.1 + 画布 (Canvas) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/changelog.html b/app/src/main/assets/docs/changelog.html index d19554df0..dbc183f02 100644 --- a/app/src/main/assets/docs/changelog.html +++ b/app/src/main/assets/docs/changelog.html @@ -2,7 +2,7 @@ - 文档更新日志 (Changelog) | AutoJs6 文档 - 6.4.1 + 文档更新日志 (Changelog) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/color.html b/app/src/main/assets/docs/color.html index f04b8c051..4a6ab1536 100644 --- a/app/src/main/assets/docs/color.html +++ b/app/src/main/assets/docs/color.html @@ -2,7 +2,7 @@ - 颜色 (Color) | AutoJs6 文档 - 6.4.1 + 颜色 (Color) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/colorTable.html b/app/src/main/assets/docs/colorTable.html index a7c6cde91..b42f12526 100644 --- a/app/src/main/assets/docs/colorTable.html +++ b/app/src/main/assets/docs/colorTable.html @@ -2,7 +2,7 @@ - 颜色列表 (Color Table) | AutoJs6 文档 - 6.4.1 + 颜色列表 (Color Table) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/colorType.html b/app/src/main/assets/docs/colorType.html index dd1f0e73c..ff3ced8a4 100644 --- a/app/src/main/assets/docs/colorType.html +++ b/app/src/main/assets/docs/colorType.html @@ -2,7 +2,7 @@ - Color (颜色类) | AutoJs6 文档 - 6.4.1 + Color (颜色类) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/console.html b/app/src/main/assets/docs/console.html index 664a1508c..c4513b7e5 100644 --- a/app/src/main/assets/docs/console.html +++ b/app/src/main/assets/docs/console.html @@ -2,7 +2,7 @@ - 控制台 (Console) | AutoJs6 文档 - 6.4.1 + 控制台 (Console) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/consoleBuildOptionsType.html b/app/src/main/assets/docs/consoleBuildOptionsType.html index 3b8561b87..52f637d81 100644 --- a/app/src/main/assets/docs/consoleBuildOptionsType.html +++ b/app/src/main/assets/docs/consoleBuildOptionsType.html @@ -2,7 +2,7 @@ - ConsoleBuildOptions | AutoJs6 文档 - 6.4.1 + ConsoleBuildOptions | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/context.html b/app/src/main/assets/docs/context.html index 948db5364..358cadf8f 100644 --- a/app/src/main/assets/docs/context.html +++ b/app/src/main/assets/docs/context.html @@ -2,7 +2,7 @@ - 上下文 (Context) | AutoJs6 文档 - 6.4.1 + 上下文 (Context) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/continuation.html b/app/src/main/assets/docs/continuation.html index 6a04dfd9c..081e6cbfe 100644 --- a/app/src/main/assets/docs/continuation.html +++ b/app/src/main/assets/docs/continuation.html @@ -2,7 +2,7 @@ - 协程 (Continuation) | AutoJs6 文档 - 6.4.1 + 协程 (Continuation) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/coverpage.html b/app/src/main/assets/docs/coverpage.html index 2af4a5366..6fc83b5be 100644 --- a/app/src/main/assets/docs/coverpage.html +++ b/app/src/main/assets/docs/coverpage.html @@ -2,7 +2,7 @@ - [AutoJs6](http://project.autojs6.com) | AutoJs6 文档 - 6.4.1 + [AutoJs6](http://project.autojs6.com) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/crypto.html b/app/src/main/assets/docs/crypto.html index 141a1cb20..7ddda3587 100644 --- a/app/src/main/assets/docs/crypto.html +++ b/app/src/main/assets/docs/crypto.html @@ -2,7 +2,7 @@ - 密文 (Crypto) | AutoJs6 文档 - 6.4.1 + 密文 (Crypto) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/cryptoCipherOptionsType.html b/app/src/main/assets/docs/cryptoCipherOptionsType.html index 7689082cd..25ee66942 100644 --- a/app/src/main/assets/docs/cryptoCipherOptionsType.html +++ b/app/src/main/assets/docs/cryptoCipherOptionsType.html @@ -2,7 +2,7 @@ - CryptoCipherOptions | AutoJs6 文档 - 6.4.1 + CryptoCipherOptions | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/cryptoKeyPairType.html b/app/src/main/assets/docs/cryptoKeyPairType.html index a0bf7d05f..3a34a17a5 100644 --- a/app/src/main/assets/docs/cryptoKeyPairType.html +++ b/app/src/main/assets/docs/cryptoKeyPairType.html @@ -2,7 +2,7 @@ - CryptoKeyPair | AutoJs6 文档 - 6.4.1 + CryptoKeyPair | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/cryptoKeyType.html b/app/src/main/assets/docs/cryptoKeyType.html index d7d3a565f..3a58b583d 100644 --- a/app/src/main/assets/docs/cryptoKeyType.html +++ b/app/src/main/assets/docs/cryptoKeyType.html @@ -2,7 +2,7 @@ - CryptoKey | AutoJs6 文档 - 6.4.1 + CryptoKey | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/dataTypes.html b/app/src/main/assets/docs/dataTypes.html index 89a848338..b3e463a34 100644 --- a/app/src/main/assets/docs/dataTypes.html +++ b/app/src/main/assets/docs/dataTypes.html @@ -2,7 +2,7 @@ - 数据类型 (Data Types) | AutoJs6 文档 - 6.4.1 + 数据类型 (Data Types) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/device.html b/app/src/main/assets/docs/device.html index a0a98412b..0bee939c5 100644 --- a/app/src/main/assets/docs/device.html +++ b/app/src/main/assets/docs/device.html @@ -2,7 +2,7 @@ - 设备 (Device) | AutoJs6 文档 - 6.4.1 + 设备 (Device) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/dialogs.html b/app/src/main/assets/docs/dialogs.html index 1908acf85..225fb924d 100644 --- a/app/src/main/assets/docs/dialogs.html +++ b/app/src/main/assets/docs/dialogs.html @@ -2,7 +2,7 @@ - 对话框 (Dialogs) | AutoJs6 文档 - 6.4.1 + 对话框 (Dialogs) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/documentation.html b/app/src/main/assets/docs/documentation.html index 897dc5f9b..9c09b907b 100644 --- a/app/src/main/assets/docs/documentation.html +++ b/app/src/main/assets/docs/documentation.html @@ -2,7 +2,7 @@ - 关于文档 (About) | AutoJs6 文档 - 6.4.1 + 关于文档 (About) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/e4x.html b/app/src/main/assets/docs/e4x.html index ea98c34ae..645a9ca90 100644 --- a/app/src/main/assets/docs/e4x.html +++ b/app/src/main/assets/docs/e4x.html @@ -2,7 +2,7 @@ - E4X | AutoJs6 文档 - 6.4.1 + E4X | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/engines.html b/app/src/main/assets/docs/engines.html index bb45b2eab..799f33eda 100644 --- a/app/src/main/assets/docs/engines.html +++ b/app/src/main/assets/docs/engines.html @@ -2,7 +2,7 @@ - 引擎 (Engines) | AutoJs6 文档 - 6.4.1 + 引擎 (Engines) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/eventEmitterType.html b/app/src/main/assets/docs/eventEmitterType.html index a780d8bba..53258e113 100644 --- a/app/src/main/assets/docs/eventEmitterType.html +++ b/app/src/main/assets/docs/eventEmitterType.html @@ -2,7 +2,7 @@ - 事件发射器 (EventEmitter) | AutoJs6 文档 - 6.4.1 + 事件发射器 (EventEmitter) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/events.html b/app/src/main/assets/docs/events.html index b29db545d..d3db0c657 100644 --- a/app/src/main/assets/docs/events.html +++ b/app/src/main/assets/docs/events.html @@ -2,7 +2,7 @@ - 事件监听 (Events) | AutoJs6 文档 - 6.4.1 + 事件监听 (Events) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/exceptions.html b/app/src/main/assets/docs/exceptions.html index dae68a01e..87c812aa6 100644 --- a/app/src/main/assets/docs/exceptions.html +++ b/app/src/main/assets/docs/exceptions.html @@ -2,7 +2,7 @@ - 异常 (Exceptions) | AutoJs6 文档 - 6.4.1 + 异常 (Exceptions) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/files.html b/app/src/main/assets/docs/files.html index 2fd2ffc70..219431c1d 100644 --- a/app/src/main/assets/docs/files.html +++ b/app/src/main/assets/docs/files.html @@ -2,7 +2,7 @@ - 文件 (Files) | AutoJs6 文档 - 6.4.1 + 文件 (Files) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/floaty.html b/app/src/main/assets/docs/floaty.html index a8d34b41f..f45b5ca4d 100644 --- a/app/src/main/assets/docs/floaty.html +++ b/app/src/main/assets/docs/floaty.html @@ -2,7 +2,7 @@ - 悬浮窗 (Floaty) | AutoJs6 文档 - 6.4.1 + 悬浮窗 (Floaty) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/global.html b/app/src/main/assets/docs/global.html index 24e9dadc4..940139314 100644 --- a/app/src/main/assets/docs/global.html +++ b/app/src/main/assets/docs/global.html @@ -2,7 +2,7 @@ - 全局对象 (Global) | AutoJs6 文档 - 6.4.1 + 全局对象 (Global) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/glossaries.html b/app/src/main/assets/docs/glossaries.html index e195abe5a..5ae2ff59e 100644 --- a/app/src/main/assets/docs/glossaries.html +++ b/app/src/main/assets/docs/glossaries.html @@ -2,7 +2,7 @@ - 术语 (Glossaries) | AutoJs6 文档 - 6.4.1 + 术语 (Glossaries) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/http.html b/app/src/main/assets/docs/http.html index dacbd63d4..8edf4bff5 100644 --- a/app/src/main/assets/docs/http.html +++ b/app/src/main/assets/docs/http.html @@ -2,7 +2,7 @@ - HTTP | AutoJs6 文档 - 6.4.1 + HTTP | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/httpHeaderGlossary.html b/app/src/main/assets/docs/httpHeaderGlossary.html index 778664f18..d528d86d6 100644 --- a/app/src/main/assets/docs/httpHeaderGlossary.html +++ b/app/src/main/assets/docs/httpHeaderGlossary.html @@ -2,7 +2,7 @@ - HTTP Header (HTTP 标头) | AutoJs6 文档 - 6.4.1 + HTTP Header (HTTP 标头) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/httpRequestBuilderOptionsType.html b/app/src/main/assets/docs/httpRequestBuilderOptionsType.html index 3c348b054..2fa5676c5 100644 --- a/app/src/main/assets/docs/httpRequestBuilderOptionsType.html +++ b/app/src/main/assets/docs/httpRequestBuilderOptionsType.html @@ -2,7 +2,7 @@ - HttpRequestBuilderOptions | AutoJs6 文档 - 6.4.1 + HttpRequestBuilderOptions | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/httpRequestHeadersType.html b/app/src/main/assets/docs/httpRequestHeadersType.html index 9cdf20d8a..fb8dd1a12 100644 --- a/app/src/main/assets/docs/httpRequestHeadersType.html +++ b/app/src/main/assets/docs/httpRequestHeadersType.html @@ -2,7 +2,7 @@ - HttpRequestHeaders | AutoJs6 文档 - 6.4.1 + HttpRequestHeaders | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/httpRequestMethodsGlossary.html b/app/src/main/assets/docs/httpRequestMethodsGlossary.html index 03daefec0..5fd44f56f 100644 --- a/app/src/main/assets/docs/httpRequestMethodsGlossary.html +++ b/app/src/main/assets/docs/httpRequestMethodsGlossary.html @@ -2,7 +2,7 @@ - HTTP Request Methods (HTTP 请求方法) | AutoJs6 文档 - 6.4.1 + HTTP Request Methods (HTTP 请求方法) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/httpResponseBodyType.html b/app/src/main/assets/docs/httpResponseBodyType.html index cf9ac10c6..f26222156 100644 --- a/app/src/main/assets/docs/httpResponseBodyType.html +++ b/app/src/main/assets/docs/httpResponseBodyType.html @@ -2,7 +2,7 @@ - HttpResponseBodyType | AutoJs6 文档 - 6.4.1 + HttpResponseBodyType | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/httpResponseHeadersType.html b/app/src/main/assets/docs/httpResponseHeadersType.html index 793344dfe..80d90b192 100644 --- a/app/src/main/assets/docs/httpResponseHeadersType.html +++ b/app/src/main/assets/docs/httpResponseHeadersType.html @@ -2,7 +2,7 @@ - HttpResponseHeaders | AutoJs6 文档 - 6.4.1 + HttpResponseHeaders | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/httpResponseType.html b/app/src/main/assets/docs/httpResponseType.html index a5da573b6..003210cf2 100644 --- a/app/src/main/assets/docs/httpResponseType.html +++ b/app/src/main/assets/docs/httpResponseType.html @@ -2,7 +2,7 @@ - HttpResponse | AutoJs6 文档 - 6.4.1 + HttpResponse | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/i18n.html b/app/src/main/assets/docs/i18n.html index 5c8adf528..c8d9bf67a 100644 --- a/app/src/main/assets/docs/i18n.html +++ b/app/src/main/assets/docs/i18n.html @@ -2,7 +2,7 @@ - 国际化 (Internationalization) | AutoJs6 文档 - 6.4.1 + 国际化 (Internationalization) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/image.html b/app/src/main/assets/docs/image.html index 71ce4a08a..19c90e531 100644 --- a/app/src/main/assets/docs/image.html +++ b/app/src/main/assets/docs/image.html @@ -2,7 +2,7 @@ - 图像 (Images) | AutoJs6 文档 - 6.4.1 + 图像 (Images) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/imageWrapperType.html b/app/src/main/assets/docs/imageWrapperType.html index de35c439c..293d24a9e 100644 --- a/app/src/main/assets/docs/imageWrapperType.html +++ b/app/src/main/assets/docs/imageWrapperType.html @@ -2,7 +2,7 @@ - 包装图像类 (ImageWrapper) | AutoJs6 文档 - 6.4.1 + 包装图像类 (ImageWrapper) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/index.html b/app/src/main/assets/docs/index.html index b1cb7a2a7..f8713dda9 100644 --- a/app/src/main/assets/docs/index.html +++ b/app/src/main/assets/docs/index.html @@ -2,7 +2,7 @@ - Index | AutoJs6 文档 - 6.4.1 + Index | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/injectableWebClientType.html b/app/src/main/assets/docs/injectableWebClientType.html index b594facd2..54eb52094 100644 --- a/app/src/main/assets/docs/injectableWebClientType.html +++ b/app/src/main/assets/docs/injectableWebClientType.html @@ -2,7 +2,7 @@ - InjectableWebClient | AutoJs6 文档 - 6.4.1 + InjectableWebClient | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/injectableWebViewType.html b/app/src/main/assets/docs/injectableWebViewType.html index 389af7c17..9f5a2f978 100644 --- a/app/src/main/assets/docs/injectableWebViewType.html +++ b/app/src/main/assets/docs/injectableWebViewType.html @@ -2,7 +2,7 @@ - InjectableWebView | AutoJs6 文档 - 6.4.1 + InjectableWebView | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/intentType.html b/app/src/main/assets/docs/intentType.html index 31fd8fb6e..9b861f09a 100644 --- a/app/src/main/assets/docs/intentType.html +++ b/app/src/main/assets/docs/intentType.html @@ -2,7 +2,7 @@ - 意图 (Intent) | AutoJs6 文档 - 6.4.1 + 意图 (Intent) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/keys.html b/app/src/main/assets/docs/keys.html index 810823289..314e5e13a 100644 --- a/app/src/main/assets/docs/keys.html +++ b/app/src/main/assets/docs/keys.html @@ -2,7 +2,7 @@ - 按键 (Keys) | AutoJs6 文档 - 6.4.1 + 按键 (Keys) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/manual.html b/app/src/main/assets/docs/manual.html index 690596eae..d5fea32db 100644 --- a/app/src/main/assets/docs/manual.html +++ b/app/src/main/assets/docs/manual.html @@ -2,7 +2,7 @@ - AutoJs6 使用手册 (Manual) | AutoJs6 文档 - 6.4.1 + AutoJs6 使用手册 (Manual) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/mathx.html b/app/src/main/assets/docs/mathx.html index 33f28fd46..8b177836d 100644 --- a/app/src/main/assets/docs/mathx.html +++ b/app/src/main/assets/docs/mathx.html @@ -2,7 +2,7 @@ - Mathx (Math 扩展) | AutoJs6 文档 - 6.4.1 + Mathx (Math 扩展) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/media.html b/app/src/main/assets/docs/media.html index 5e8a1a492..d7f907ee8 100644 --- a/app/src/main/assets/docs/media.html +++ b/app/src/main/assets/docs/media.html @@ -2,7 +2,7 @@ - 多媒体 (Media) | AutoJs6 文档 - 6.4.1 + 多媒体 (Media) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/mimeTypeGlossary.html b/app/src/main/assets/docs/mimeTypeGlossary.html index 8e171960c..0d7fb2698 100644 --- a/app/src/main/assets/docs/mimeTypeGlossary.html +++ b/app/src/main/assets/docs/mimeTypeGlossary.html @@ -2,7 +2,7 @@ - MIME Type (MIME 类型) | AutoJs6 文档 - 6.4.1 + MIME Type (MIME 类型) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/modules.html b/app/src/main/assets/docs/modules.html index 7fb74ece3..29c9cd2aa 100644 --- a/app/src/main/assets/docs/modules.html +++ b/app/src/main/assets/docs/modules.html @@ -2,7 +2,7 @@ - 模块 (Module) | AutoJs6 文档 - 6.4.1 + 模块 (Module) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/notice.html b/app/src/main/assets/docs/notice.html index 5640459bb..0a80e80f0 100644 --- a/app/src/main/assets/docs/notice.html +++ b/app/src/main/assets/docs/notice.html @@ -2,7 +2,7 @@ - 消息通知 (Notice) | AutoJs6 文档 - 6.4.1 + 消息通知 (Notice) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/noticeBuilderType.html b/app/src/main/assets/docs/noticeBuilderType.html index a56dca1bb..85a4f2263 100644 --- a/app/src/main/assets/docs/noticeBuilderType.html +++ b/app/src/main/assets/docs/noticeBuilderType.html @@ -2,7 +2,7 @@ - NoticeBuilder | AutoJs6 文档 - 6.4.1 + NoticeBuilder | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/noticeChannelOptionsType.html b/app/src/main/assets/docs/noticeChannelOptionsType.html index 9312c4d4f..9c0553a99 100644 --- a/app/src/main/assets/docs/noticeChannelOptionsType.html +++ b/app/src/main/assets/docs/noticeChannelOptionsType.html @@ -2,7 +2,7 @@ - NoticeChannelOptions | AutoJs6 文档 - 6.4.1 + NoticeChannelOptions | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/noticeOptionsType.html b/app/src/main/assets/docs/noticeOptionsType.html index 17d6dbc6a..267506edd 100644 --- a/app/src/main/assets/docs/noticeOptionsType.html +++ b/app/src/main/assets/docs/noticeOptionsType.html @@ -2,7 +2,7 @@ - NoticeOptions | AutoJs6 文档 - 6.4.1 + NoticeOptions | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/noticePresetConfigurationType.html b/app/src/main/assets/docs/noticePresetConfigurationType.html index 86ec7a4ba..6dc9097ff 100644 --- a/app/src/main/assets/docs/noticePresetConfigurationType.html +++ b/app/src/main/assets/docs/noticePresetConfigurationType.html @@ -2,7 +2,7 @@ - NoticePresetConfiguration | AutoJs6 文档 - 6.4.1 + NoticePresetConfiguration | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/notificationChannelGlossary.html b/app/src/main/assets/docs/notificationChannelGlossary.html index f6a1d94cb..eee107e40 100644 --- a/app/src/main/assets/docs/notificationChannelGlossary.html +++ b/app/src/main/assets/docs/notificationChannelGlossary.html @@ -2,7 +2,7 @@ - Notification Channel (通知渠道) | AutoJs6 文档 - 6.4.1 + Notification Channel (通知渠道) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/numberx.html b/app/src/main/assets/docs/numberx.html index e8ce86f63..9734ead7f 100644 --- a/app/src/main/assets/docs/numberx.html +++ b/app/src/main/assets/docs/numberx.html @@ -2,7 +2,7 @@ - Numberx (Number 扩展) | AutoJs6 文档 - 6.4.1 + Numberx (Number 扩展) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/ocr.html b/app/src/main/assets/docs/ocr.html index e59ee025b..be1930e41 100644 --- a/app/src/main/assets/docs/ocr.html +++ b/app/src/main/assets/docs/ocr.html @@ -2,7 +2,7 @@ - 光学字符识别 (OCR) | AutoJs6 文档 - 6.4.1 + 光学字符识别 (OCR) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/ocrOptionsType.html b/app/src/main/assets/docs/ocrOptionsType.html index 1788a8f74..6706a0253 100644 --- a/app/src/main/assets/docs/ocrOptionsType.html +++ b/app/src/main/assets/docs/ocrOptionsType.html @@ -2,7 +2,7 @@ - OcrOptions | AutoJs6 文档 - 6.4.1 + OcrOptions | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/okhttp3HttpUrlType.html b/app/src/main/assets/docs/okhttp3HttpUrlType.html index eecf739df..db8886900 100644 --- a/app/src/main/assets/docs/okhttp3HttpUrlType.html +++ b/app/src/main/assets/docs/okhttp3HttpUrlType.html @@ -2,7 +2,7 @@ - Okhttp3HttpUrlType | AutoJs6 文档 - 6.4.1 + Okhttp3HttpUrlType | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/okhttp3RequestType.html b/app/src/main/assets/docs/okhttp3RequestType.html index a81761391..55d9bdbd2 100644 --- a/app/src/main/assets/docs/okhttp3RequestType.html +++ b/app/src/main/assets/docs/okhttp3RequestType.html @@ -2,7 +2,7 @@ - Okhttp3Request | AutoJs6 文档 - 6.4.1 + Okhttp3Request | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/omniTypes.html b/app/src/main/assets/docs/omniTypes.html index 9de2debf9..8ddd95108 100644 --- a/app/src/main/assets/docs/omniTypes.html +++ b/app/src/main/assets/docs/omniTypes.html @@ -2,7 +2,7 @@ - 全能类型 (Omnipotent Types) | AutoJs6 文档 - 6.4.1 + 全能类型 (Omnipotent Types) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/opencvPointType.html b/app/src/main/assets/docs/opencvPointType.html index 933a62e4b..6b0e55356 100644 --- a/app/src/main/assets/docs/opencvPointType.html +++ b/app/src/main/assets/docs/opencvPointType.html @@ -2,7 +2,7 @@ - OpencvPoint | AutoJs6 文档 - 6.4.1 + OpencvPoint | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/opencvRectType.html b/app/src/main/assets/docs/opencvRectType.html index f0e592fa8..0260c2f5d 100644 --- a/app/src/main/assets/docs/opencvRectType.html +++ b/app/src/main/assets/docs/opencvRectType.html @@ -2,7 +2,7 @@ - OpencvRect | AutoJs6 文档 - 6.4.1 + OpencvRect | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/opencvSizeType.html b/app/src/main/assets/docs/opencvSizeType.html index 8977f20ba..26ec81d31 100644 --- a/app/src/main/assets/docs/opencvSizeType.html +++ b/app/src/main/assets/docs/opencvSizeType.html @@ -2,7 +2,7 @@ - OpencvSize | AutoJs6 文档 - 6.4.1 + OpencvSize | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/overview.html b/app/src/main/assets/docs/overview.html index 10c4539f7..ea0013307 100644 --- a/app/src/main/assets/docs/overview.html +++ b/app/src/main/assets/docs/overview.html @@ -2,7 +2,7 @@ - 综述 (Overview) | AutoJs6 文档 - 6.4.1 + 综述 (Overview) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/plugins.html b/app/src/main/assets/docs/plugins.html index 044066156..6d135d128 100644 --- a/app/src/main/assets/docs/plugins.html +++ b/app/src/main/assets/docs/plugins.html @@ -2,7 +2,7 @@ - 插件 (Plugins) | AutoJs6 文档 - 6.4.1 + 插件 (Plugins) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/polyfill.html b/app/src/main/assets/docs/polyfill.html index cba815d0e..65bdceee1 100644 --- a/app/src/main/assets/docs/polyfill.html +++ b/app/src/main/assets/docs/polyfill.html @@ -2,7 +2,7 @@ - 代码填泥 (Polyfill) | AutoJs6 文档 - 6.4.1 + 代码填泥 (Polyfill) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/progress.html b/app/src/main/assets/docs/progress.html index e2b05f79c..d2cf59cf9 100644 --- a/app/src/main/assets/docs/progress.html +++ b/app/src/main/assets/docs/progress.html @@ -2,7 +2,7 @@ - 文档部署进度 (Progress) | AutoJs6 文档 - 6.4.1 + 文档部署进度 (Progress) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/qa.html b/app/src/main/assets/docs/qa.html index 50e20a595..44ed91b64 100644 --- a/app/src/main/assets/docs/qa.html +++ b/app/src/main/assets/docs/qa.html @@ -2,7 +2,7 @@ - 疑难解答 (Q & A) | AutoJs6 文档 - 6.4.1 + 疑难解答 (Q & A) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/qrcode.html b/app/src/main/assets/docs/qrcode.html index a6889a972..c21983032 100644 --- a/app/src/main/assets/docs/qrcode.html +++ b/app/src/main/assets/docs/qrcode.html @@ -2,7 +2,7 @@ - 二维码 (QR Code) | AutoJs6 文档 - 6.4.1 + 二维码 (QR Code) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/recorder.html b/app/src/main/assets/docs/recorder.html index 32b02da95..bf9cb9bad 100644 --- a/app/src/main/assets/docs/recorder.html +++ b/app/src/main/assets/docs/recorder.html @@ -2,7 +2,7 @@ - 记录器 (Recorder) | AutoJs6 文档 - 6.4.1 + 记录器 (Recorder) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/runtime.html b/app/src/main/assets/docs/runtime.html index 390a083e4..dfa3d4a3b 100644 --- a/app/src/main/assets/docs/runtime.html +++ b/app/src/main/assets/docs/runtime.html @@ -2,7 +2,7 @@ - 运行时 (Runtime) | AutoJs6 文档 - 6.4.1 + 运行时 (Runtime) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/s13n.html b/app/src/main/assets/docs/s13n.html index f9bbd230e..d7de2599c 100644 --- a/app/src/main/assets/docs/s13n.html +++ b/app/src/main/assets/docs/s13n.html @@ -2,7 +2,7 @@ - 标准化 (Standardization) | AutoJs6 文档 - 6.4.1 + 标准化 (Standardization) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/scriptingJava.html b/app/src/main/assets/docs/scriptingJava.html index 5fed10743..93deab3de 100644 --- a/app/src/main/assets/docs/scriptingJava.html +++ b/app/src/main/assets/docs/scriptingJava.html @@ -2,7 +2,7 @@ - 脚本化 Java | AutoJs6 文档 - 6.4.1 + 脚本化 Java | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/sensors.html b/app/src/main/assets/docs/sensors.html index b6cad7779..7781eff6e 100644 --- a/app/src/main/assets/docs/sensors.html +++ b/app/src/main/assets/docs/sensors.html @@ -2,7 +2,7 @@ - 传感器 (Sensors) | AutoJs6 文档 - 6.4.1 + 传感器 (Sensors) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/shell.html b/app/src/main/assets/docs/shell.html index 76c6677e7..80e7d1537 100644 --- a/app/src/main/assets/docs/shell.html +++ b/app/src/main/assets/docs/shell.html @@ -2,7 +2,7 @@ - Shell | AutoJs6 文档 - 6.4.1 + Shell | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/shizuku.html b/app/src/main/assets/docs/shizuku.html index 26c324557..0cfe0e2b8 100644 --- a/app/src/main/assets/docs/shizuku.html +++ b/app/src/main/assets/docs/shizuku.html @@ -2,7 +2,7 @@ - Shizuku | AutoJs6 文档 - 6.4.1 + Shizuku | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/sidebar.html b/app/src/main/assets/docs/sidebar.html index d5fdf41ff..16f29db72 100644 --- a/app/src/main/assets/docs/sidebar.html +++ b/app/src/main/assets/docs/sidebar.html @@ -2,7 +2,7 @@ - Index | AutoJs6 文档 - 6.4.1 + Index | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/storageType.html b/app/src/main/assets/docs/storageType.html index 1644a40a5..d7deffb7d 100644 --- a/app/src/main/assets/docs/storageType.html +++ b/app/src/main/assets/docs/storageType.html @@ -2,7 +2,7 @@ - Storage (存储类) | AutoJs6 文档 - 6.4.1 + Storage (存储类) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/storages.html b/app/src/main/assets/docs/storages.html index 18331f70e..07b56a175 100644 --- a/app/src/main/assets/docs/storages.html +++ b/app/src/main/assets/docs/storages.html @@ -2,7 +2,7 @@ - 存储 (Storages) | AutoJs6 文档 - 6.4.1 + 存储 (Storages) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/tasks.html b/app/src/main/assets/docs/tasks.html index dbe5b13c3..b9c997a60 100644 --- a/app/src/main/assets/docs/tasks.html +++ b/app/src/main/assets/docs/tasks.html @@ -2,7 +2,7 @@ - 任务 (Tasks) | AutoJs6 文档 - 6.4.1 + 任务 (Tasks) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/threads.html b/app/src/main/assets/docs/threads.html index f4db39590..b8eaf6077 100644 --- a/app/src/main/assets/docs/threads.html +++ b/app/src/main/assets/docs/threads.html @@ -2,7 +2,7 @@ - 线程 (Threads) | AutoJs6 文档 - 6.4.1 + 线程 (Threads) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/timers.html b/app/src/main/assets/docs/timers.html index 95d2faa10..d6fedb62b 100644 --- a/app/src/main/assets/docs/timers.html +++ b/app/src/main/assets/docs/timers.html @@ -2,7 +2,7 @@ - 定时器 (Timers) | AutoJs6 文档 - 6.4.1 + 定时器 (Timers) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/toast.html b/app/src/main/assets/docs/toast.html index 28d43363b..d00916120 100644 --- a/app/src/main/assets/docs/toast.html +++ b/app/src/main/assets/docs/toast.html @@ -2,7 +2,7 @@ - 消息浮动框 (Toast) | AutoJs6 文档 - 6.4.1 + 消息浮动框 (Toast) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/ui.html b/app/src/main/assets/docs/ui.html index 5bba7602f..12eef0a6d 100644 --- a/app/src/main/assets/docs/ui.html +++ b/app/src/main/assets/docs/ui.html @@ -2,7 +2,7 @@ - 用户界面 (UI) | AutoJs6 文档 - 6.4.1 + 用户界面 (UI) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/uiObjectActionsType.html b/app/src/main/assets/docs/uiObjectActionsType.html index c828e9890..9043276b8 100644 --- a/app/src/main/assets/docs/uiObjectActionsType.html +++ b/app/src/main/assets/docs/uiObjectActionsType.html @@ -2,7 +2,7 @@ - 控件节点行为 (UiObjectActions) | AutoJs6 文档 - 6.4.1 + 控件节点行为 (UiObjectActions) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/uiObjectCollectionType.html b/app/src/main/assets/docs/uiObjectCollectionType.html index 89a559b51..1ff7c2499 100644 --- a/app/src/main/assets/docs/uiObjectCollectionType.html +++ b/app/src/main/assets/docs/uiObjectCollectionType.html @@ -2,7 +2,7 @@ - 控件集合 (UiObjectCollection) | AutoJs6 文档 - 6.4.1 + 控件集合 (UiObjectCollection) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | diff --git a/app/src/main/assets/docs/uiObjectType.html b/app/src/main/assets/docs/uiObjectType.html index ba1ee75f2..a3581937e 100644 --- a/app/src/main/assets/docs/uiObjectType.html +++ b/app/src/main/assets/docs/uiObjectType.html @@ -2,7 +2,7 @@ - 控件节点 (UiObject) | AutoJs6 文档 - 6.4.1 + 控件节点 (UiObject) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

-

AutoJs6 文档 - 6.4.1

+

AutoJs6 文档 - 6.4.2

索引 | @@ -348,6 +348,10 @@

目录

  • point()
  • +
  • [m#] center +
  • [m#] size @@ -1296,6 +1300,7 @@

    point()Point).

    该中心点坐标由 exactCenterXexactCenterY 计算获得, 因此会保留精度.

    +

    center 的别名方法.

    let wA = pickup(/.+/);
     console.log(wA.bounds()); // e.g. Rect(0, 0 - 10, 12)
     console.log(wA.point()); // e.g. {5.0, 6.0}
    @@ -1306,6 +1311,25 @@ 

    point()#

    +

    center()#

    +

    6.4.2 A11Y

    + +

    返回控件矩形的中心点 (Point).

    +

    该中心点坐标由 exactCenterXexactCenterY 计算获得, 因此会保留精度.

    +

    point 的别名方法.

    +
    let wA = pickup(/.+/);
    +console.log(wA.bounds()); // e.g. Rect(0, 0 - 10, 12)
    +console.log(wA.center()); // e.g. {5.0, 6.0}
    +console.log(wA.center().x); // e.g. 5
    +
    +let wB = pickup(/.+/);
    +console.log(wB.bounds()); // e.g. Rect(0, 0 - 11, 13)
    +console.log(wB.center()); // e.g. {5.5, 6.5}
    +console.log(wB.center().y); // e.g. 6.5
    +

    [m#] size#

    size()#

    6.2.0 A11Y

    diff --git a/app/src/main/assets/docs/uiSelectorType.html b/app/src/main/assets/docs/uiSelectorType.html index 6f040ee3c..2a80d9f77 100644 --- a/app/src/main/assets/docs/uiSelectorType.html +++ b/app/src/main/assets/docs/uiSelectorType.html @@ -2,7 +2,7 @@ - 选择器 (UiSelector) | AutoJs6 文档 - 6.4.1 + 选择器 (UiSelector) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@
    -

    AutoJs6 文档 - 6.4.1

    +

    AutoJs6 文档 - 6.4.2

    索引 | diff --git a/app/src/main/assets/docs/util.html b/app/src/main/assets/docs/util.html index be7c63447..5c669a591 100644 --- a/app/src/main/assets/docs/util.html +++ b/app/src/main/assets/docs/util.html @@ -2,7 +2,7 @@ - Util | AutoJs6 文档 - 6.4.1 + Util | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

    -

    AutoJs6 文档 - 6.4.1

    +

    AutoJs6 文档 - 6.4.2

    索引 | diff --git a/app/src/main/assets/docs/versionType.html b/app/src/main/assets/docs/versionType.html index 8347d473c..e5e68fd16 100644 --- a/app/src/main/assets/docs/versionType.html +++ b/app/src/main/assets/docs/versionType.html @@ -2,7 +2,7 @@ - 版本工具类 (Version) | AutoJs6 文档 - 6.4.1 + 版本工具类 (Version) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

    -

    AutoJs6 文档 - 6.4.1

    +

    AutoJs6 文档 - 6.4.2

    索引 | diff --git a/app/src/main/assets/docs/web.html b/app/src/main/assets/docs/web.html index 9c09d8413..7c9c6c1a3 100644 --- a/app/src/main/assets/docs/web.html +++ b/app/src/main/assets/docs/web.html @@ -2,7 +2,7 @@ - 万维网 (Web) | AutoJs6 文档 - 6.4.1 + 万维网 (Web) | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

    -

    AutoJs6 文档 - 6.4.1

    +

    AutoJs6 文档 - 6.4.2

    索引 | diff --git a/app/src/main/assets/docs/webSocketType.html b/app/src/main/assets/docs/webSocketType.html index 326fa80e3..f81f5d2ed 100644 --- a/app/src/main/assets/docs/webSocketType.html +++ b/app/src/main/assets/docs/webSocketType.html @@ -2,7 +2,7 @@ - WebSocket | AutoJs6 文档 - 6.4.1 + WebSocket | AutoJs6 文档 - 6.4.2 @@ -160,7 +160,7 @@

    -

    AutoJs6 文档 - 6.4.1

    +

    AutoJs6 文档 - 6.4.2

    索引 | diff --git a/app/src/main/assets/init.js b/app/src/main/assets/init.js index 0c25a550d..6a09e95f0 100644 --- a/app/src/main/assets/init.js +++ b/app/src/main/assets/init.js @@ -7,56 +7,106 @@ let global = this; /* Global classes. */ -let Paint = android.graphics.Paint; -let App = org.autojs.autojs.util.App; -let RootMode = org.autojs.autojs.util.RootUtils.RootMode; -let Pref = org.autojs.autojs.pref.Pref; -let Shell = org.autojs.autojs.runtime.api.Shell; -let Intent = global.Intent = android.content.Intent; -let Context = global.Context = android.content.Context; +let Manifest = android.Manifest; +let Notification = android.app.Notification; +let NotificationManager = android.app.NotificationManager; let PendingIntent = android.app.PendingIntent; -let Toast = android.widget.Toast; +let Context = global.Context = android.content.Context; +let Intent = global.Intent = android.content.Intent; +let PackageManager = android.content.pm.PackageManager; +let ColorStateList = android.content.res.ColorStateList; +let Bitmap = android.graphics.Bitmap; +let BitmapFactory = android.graphics.BitmapFactory; +let Paint = android.graphics.Paint; +let ColorDrawable = android.graphics.drawable.ColorDrawable; +let Uri = android.net.Uri; +let Build = android.os.Build; +let Handler = android.os.Handler; +let Looper = android.os.Looper; +let InputType = android.text.InputType; +let TextWatcher = android.text.TextWatcher; +let Linkify = android.text.util.Linkify; +let Base64 = android.util.Base64; +let Log = android.util.Log; +let ContextThemeWrapper = android.view.ContextThemeWrapper; +let Gravity = android.view.Gravity; let KeyEvent = android.view.KeyEvent; let MotionEvent = android.view.MotionEvent; -let Version = Packages.io.github.g00fy2.versioncompare.Version; -let Crypto = org.autojs.autojs.core.crypto.Crypto; -let Image = org.autojs.autojs.core.image.ImageWrapper; -let ColorTable = org.autojs.autojs.core.image.ColorTable; -let Canvas = org.autojs.autojs.core.graphics.ScriptCanvas; -let EventEmitter = org.autojs.autojs.core.eventloop.EventEmitter; +let LayoutParams = android.view.WindowManager.LayoutParams; +let MimeTypeMap = android.webkit.MimeTypeMap; +let WebChromeClient = android.webkit.WebChromeClient; +let WebView = android.webkit.WebView; +let WebViewClient = android.webkit.WebViewClient; +let Toast = android.widget.Toast; +let BigTextStyle = androidx.core.app.NotificationCompat.BigTextStyle; +let NotificationCompat = androidx.core.app.NotificationCompat; +let FileProvider = androidx.core.content.FileProvider; +let Snackbar = com.google.android.material.snackbar.Snackbar; +let LogConfigurator = de.mindpipe.android.logging.log4j.LogConfigurator; +let Version = io.github.g00fy2.versioncompare.Version; +let ByteArrayOutputStream = java.io.ByteArrayOutputStream; +let File = java.io.File; +let Runnable = java.lang.Runnable; +let SecurityException = java.lang.SecurityException; +let Thread = java.lang.Thread; +let Throwable = java.lang.Throwable; +let URI = java.net.URI; +let StandardCharsets = java.nio.charset.StandardCharsets; +let Locale = java.util.Locale; +let AtomicLong = java.util.concurrent.atomic.AtomicLong; +let ReentrantLock = java.util.concurrent.locks.ReentrantLock; +let Callback = okhttp3.Callback; +let FormBody = okhttp3.FormBody; +let MediaType = okhttp3.MediaType; +let MultipartBody = okhttp3.MultipartBody; +let OkHttpClient = okhttp3.OkHttpClient; +let Request = okhttp3.Request; +let RequestBody = okhttp3.RequestBody; +let Level = org.apache.log4j.Level; +let LogManager = org.apache.log4j.LogManager; +let GlobalAppContext = org.autojs.autojs.app.GlobalAppContext; +let AccessibilityBridge = org.autojs.autojs.core.accessibility.AccessibilityBridge; +let UiSelector = org.autojs.autojs.core.accessibility.UiSelector; let UiObject = org.autojs.autojs.core.automator.UiObject; let UiObjectCollection = org.autojs.autojs.core.automator.UiObjectCollection; -let ImageWrapper = org.autojs.autojs.core.image.ImageWrapper; -let UiSelector = org.autojs.autojs.core.accessibility.UiSelector; -let VolatileBox = org.autojs.concurrent.VolatileBox; +let Crypto = org.autojs.autojs.core.crypto.Crypto; +let EventEmitter = org.autojs.autojs.core.eventloop.EventEmitter; +let Canvas = org.autojs.autojs.core.graphics.ScriptCanvas; let MutableOkHttp = org.autojs.autojs.core.http.MutableOkHttp; -let OkHttpClient = Packages.okhttp3.OkHttpClient; -let ScriptInterruptedException = org.autojs.autojs.runtime.exception.ScriptInterruptedException; -let ReentrantLock = java.util.concurrent.locks.ReentrantLock; -let ScreenMetrics = org.autojs.autojs.runtime.api.ScreenMetrics; +let ColorDetector = org.autojs.autojs.core.image.ColorDetector; +let ColorTable = org.autojs.autojs.core.image.ColorTable; +let Image = org.autojs.autojs.core.image.ImageWrapper; +let ImageWrapper = org.autojs.autojs.core.image.ImageWrapper; +let Mat = org.autojs.autojs.core.opencv.Mat; +let DynamicLayoutInflater = org.autojs.autojs.core.ui.inflater.DynamicLayoutInflater; +let JavaScriptEngine = org.autojs.autojs.engine.JavaScriptEngine; +let PFile = org.autojs.autojs.pio.PFile; +let Pref = org.autojs.autojs.pref.Pref; +let ProxyJavaObject = org.autojs.autojs.rhino.ProxyJavaObject; +let ProxyObject = org.autojs.autojs.rhino.ProxyObject; let ScriptRuntime = org.autojs.autojs.runtime.ScriptRuntime; -let StandardCharsets = java.nio.charset.StandardCharsets; -let WebView = android.webkit.WebView; -let WebViewClient = android.webkit.WebViewClient; -let WebChromeClient = android.webkit.WebChromeClient; -let GlobalAppContext = org.autojs.autojs.app.GlobalAppContext; +let AppUtils = org.autojs.autojs.runtime.api.AppUtils; +let ScreenMetrics = org.autojs.autojs.runtime.api.ScreenMetrics; +let Shell = org.autojs.autojs.runtime.api.Shell; +let ScriptInterruptedException = org.autojs.autojs.runtime.exception.ScriptInterruptedException; +let JavaScriptSource = org.autojs.autojs.script.JavaScriptSource; +let ThemeColor = org.autojs.autojs.theme.ThemeColor; +let App = org.autojs.autojs.util.App; let ArrayUtils = org.autojs.autojs.util.ArrayUtils; +let ColorUtils = org.autojs.autojs.util.ColorUtils; +let ConsoleUtils = org.autojs.autojs.util.ConsoleUtils; +let DeviceUtils = org.autojs.autojs.util.DeviceUtils; let DisplayUtils = org.autojs.autojs.util.DisplayUtils; +let JavaUtils = org.autojs.autojs.util.JavaUtils; +let NetworkUtils = org.autojs.autojs.util.NetworkUtils; +let NotificationUtils = org.autojs.autojs.util.NotificationUtils; +let RootMode = org.autojs.autojs.util.RootUtils.RootMode; +let RootUtils = org.autojs.autojs.util.RootUtils; let StringUtils = org.autojs.autojs.util.StringUtils; -let ColorUtils = org.autojs.autojs.util.ColorUtils; let TextUtils = org.autojs.autojs.util.TextUtils; -let ProxyObject = org.autojs.autojs.rhino.ProxyObject; -let ProxyJavaObject = org.autojs.autojs.rhino.ProxyJavaObject; -let JavaScriptSource = org.autojs.autojs.script.JavaScriptSource; -let NotificationManager = android.app.NotificationManager; -let NotificationCompat = Packages.androidx.core.app.NotificationCompat; -let SecurityException = java.lang.SecurityException; -let FileProvider = androidx.core.content.FileProvider; -let AppUtils = org.autojs.autojs.runtime.api.AppUtils; -let Locale = java.util.Locale; -let URI = java.net.URI; -let File = java.io.File; -let Uri = android.net.Uri; +let BuildConfig = org.autojs.autojs6.BuildConfig; +let VolatileBox = org.autojs.concurrent.VolatileBox; +let Imgproc = org.opencv.imgproc.Imgproc; /* Global View classes. */ @@ -332,10 +382,6 @@ Object.assign(this, { let $ = { init() { runtime.init(); - - // 设置 JavaScriptBridges 用于与 Java 层的交互和数据转换. - runtime.bridges.setBridges(require('__bridges__')); - return this; }, bind() { diff --git a/app/src/main/assets/modules/__autojs__.js b/app/src/main/assets/modules/__autojs__.js index f7282209a..9702f5544 100644 --- a/app/src/main/assets/modules/__autojs__.js +++ b/app/src/main/assets/modules/__autojs__.js @@ -10,10 +10,6 @@ let { util } = global; * @return {Internal.Autojs} */ module.exports = function (scriptRuntime, scope) { - const Manifest = android.Manifest; - const BuildConfig = org.autojs.autojs6.BuildConfig; - const PackageManager = android.content.pm.PackageManager; - const RootUtils = org.autojs.autojs.util.RootUtils; const RootMode = RootUtils.RootMode; const Settings = android.provider.Settings; const System = Settings.System; diff --git a/app/src/main/assets/modules/__automator__.js b/app/src/main/assets/modules/__automator__.js index e85f480aa..d39db412d 100644 --- a/app/src/main/assets/modules/__automator__.js +++ b/app/src/main/assets/modules/__automator__.js @@ -15,7 +15,7 @@ module.exports = function (scriptRuntime, scope) { const Path = android.graphics.Path; const Rect = android.graphics.Rect; const GestureDescription = android.accessibilityservice.GestureDescription; - const AccessibilityBridge = org.autojs.autojs.core.accessibility.AccessibilityBridge; + const AccessibilityTool = org.autojs.autojs.core.accessibility.AccessibilityTool; /** * @type {org.autojs.autojs.core.accessibility.SimpleActionAutomator} @@ -27,17 +27,25 @@ module.exports = function (scriptRuntime, scope) { */ const a11yBridge = scriptRuntime.accessibilityBridge; + const a11yService = new AccessibilityTool(context).getService(); + let _ = { Auto: (/* @IIFE */ () => { /** * @implements Internal.Auto */ const Auto = function () { - return Object.assign(function (mode) { - if (typeof mode === 'string') { - auto.setMode(mode); + return Object.assign(function __(mode, isForcibleRestart) { + if (typeof arguments[0] === 'boolean') { + a11yBridge.ensureServiceStarted(arguments[0]); + return; + } + if (typeof arguments[0] === 'string') { + auto.setMode(arguments[0]); + } + if (typeof arguments[1] === 'boolean') { + a11yBridge.ensureServiceStarted(arguments[1]); } - a11yBridge.ensureServiceEnabled(); }, Auto.prototype); }; @@ -61,6 +69,15 @@ module.exports = function (scriptRuntime, scope) { return util.java.toJsArray(a11yBridge.windowRoots(), false) .map(root => UiObject.createRoot(root)); }, + start() { + return a11yService.start(); + }, + stop() { + return a11yService.stop(); + }, + isRunning() { + return a11yService.isRunning(); + }, stateListener(listener) { return a11yBridge.setAccessibilityListener(listener); }, @@ -146,7 +163,7 @@ module.exports = function (scriptRuntime, scope) { rtAutomator.ensureService(); }, waitForService(timeout) { - a11yBridge.waitForServiceEnabled(_.parseNumber(timeout, -1)); + a11yService.startAndWaitFor(_.parseNumber(timeout, -1)); }, click() { if (arguments.length === 2) { diff --git a/app/src/main/assets/modules/__base64__.js b/app/src/main/assets/modules/__base64__.js index df0d77bab..947cae2d4 100644 --- a/app/src/main/assets/modules/__base64__.js +++ b/app/src/main/assets/modules/__base64__.js @@ -4,7 +4,6 @@ * @return {Internal.Base64} */ module.exports = function (scriptRuntime, scope) { - const Base64 = android.util.Base64; let _ = { Base64Ctor: (/* @IIFE */ () => { /** diff --git a/app/src/main/assets/modules/__bridges__.js b/app/src/main/assets/modules/__bridges__.js deleted file mode 100644 index e9dd8bbd2..000000000 --- a/app/src/main/assets/modules/__bridges__.js +++ /dev/null @@ -1,42 +0,0 @@ -( /* @ModuleIIFE */ () => { - - let _ = { - unwrapIfNeeded(o) { - return isJavaObject(o) ? unwrapJavaObject(o) : o; - }, - }; - - module.exports = { - toArray(iterable) { - let iterator = iterable.iterator(); - let arr = []; - while (iterator.hasNext()) { - arr.push(iterator.next()); - } - return arr; - }, - asArray(list) { - let arr = []; - for (let i = 0; i < list.size(); i += 1) { - arr.push(list.get(i)); - } - for (let key in list) { - if (typeof key !== 'number') { - let v = list[key]; - arr[key] = typeof v === 'function' ? v.bind(list) : v; - } - } - return arr; - }, - toString(o) { - return String(o); - }, - call(func, target, args) { - return func.apply(target, args.map(_.unwrapIfNeeded)); - }, - toPrimitive(o) { - return _.unwrapIfNeeded(o); - }, - }; - -})(); \ No newline at end of file diff --git a/app/src/main/assets/modules/__colors__.js b/app/src/main/assets/modules/__colors__.js index 4ec20cc7a..4e76a63b1 100644 --- a/app/src/main/assets/modules/__colors__.js +++ b/app/src/main/assets/modules/__colors__.js @@ -15,10 +15,6 @@ module.exports = function (scriptRuntime, scope) { */ const rtColors = scriptRuntime.colors; - const ColorStateList = android.content.res.ColorStateList; - const ColorDetector = org.autojs.autojs.core.image.ColorDetector; - const ThemeColor = org.autojs.autojs.theme.ThemeColor; - let _ = { Color: (/* @IIFE */ () => { /** diff --git a/app/src/main/assets/modules/__console__.js b/app/src/main/assets/modules/__console__.js index 30d2fde22..b07551d24 100644 --- a/app/src/main/assets/modules/__console__.js +++ b/app/src/main/assets/modules/__console__.js @@ -9,12 +9,6 @@ let { files, util, s13n } = global; * @return {Internal.Console} */ module.exports = function (scriptRuntime, scope) { - const Log = android.util.Log; - const Level = org.apache.log4j.Level; - const LogManager = org.apache.log4j.LogManager; - const LogConfigurator = de.mindpipe.android.logging.log4j.LogConfigurator; - const ConsoleUtils = org.autojs.autojs.util.ConsoleUtils; - // noinspection JSValidateTypes /** @type {org.autojs.autojs.core.console.GlobalConsole} */ const rtConsole = scriptRuntime.console; @@ -242,6 +236,10 @@ module.exports = function (scriptRuntime, scope) { rtConsole.setExitOnClose.apply(rtConsole, arguments); return this; }, + setTouchable(touchable) { + rtConsole.setTouchable.apply(rtConsole, arguments); + return this; + }, setGlobalLogConfig(config) { let configurator = new LogConfigurator(); configurator.setFileName(files.path(_.parseOption(config.file, 'android-log4j.log'))); diff --git a/app/src/main/assets/modules/__device__.js b/app/src/main/assets/modules/__device__.js index 406d9e8a4..4e33896b7 100644 --- a/app/src/main/assets/modules/__device__.js +++ b/app/src/main/assets/modules/__device__.js @@ -10,9 +10,6 @@ let { util } = global; * @return {Internal.Device} */ module.exports = function (scriptRuntime, scope) { - const NetworkUtils = org.autojs.autojs.util.NetworkUtils; - const DeviceUtils = org.autojs.autojs.util.DeviceUtils; - const rtDevice = scriptRuntime.device; let _ = { diff --git a/app/src/main/assets/modules/__dialogs__.js b/app/src/main/assets/modules/__dialogs__.js index f4f48f568..c41348492 100644 --- a/app/src/main/assets/modules/__dialogs__.js +++ b/app/src/main/assets/modules/__dialogs__.js @@ -8,11 +8,6 @@ let { colors, threads, ui } = global; * @return {Internal.Dialogs} */ module.exports = function (scriptRuntime, scope) { - const Looper = android.os.Looper; - const Linkify = android.text.util.Linkify; - const LayoutParams = android.view.WindowManager.LayoutParams; - const ColorDrawable = android.graphics.drawable.ColorDrawable; - let _ = { Dialogs: (/* @IIFE */ () => { /** @@ -298,11 +293,13 @@ module.exports = function (scriptRuntime, scope) { throw Error(`Unknown linkify: ${props.linkify}`); })(); let view = dialog.getContentView(); - let text = view.getText().toString(); - ui.run(() => { - view.setAutoLinkMask(linkify); - view.setText(text); - }); + if (view !== null) { + let text = view.getText().toString(); + ui.run(() => { + view.setAutoLinkMask(linkify); + view.setText(text); + }); + } } if (props.onBackKey !== undefined) { @@ -373,6 +370,13 @@ module.exports = function (scriptRuntime, scope) { win.addFlags(LayoutParams.FLAG_KEEP_SCREEN_ON); }); } + + if (typeof props.inputSingleLine === 'boolean') { + let inputEditText = dialog.getInputEditText(); + if (inputEditText !== null) { + inputEditText.setSingleLine(props.inputSingleLine); + } + } }, wrapNonNullString(str) { return isNullish(str) ? '' : String(str); diff --git a/app/src/main/assets/modules/__http__.js b/app/src/main/assets/modules/__http__.js index d3ca82892..678a48187 100644 --- a/app/src/main/assets/modules/__http__.js +++ b/app/src/main/assets/modules/__http__.js @@ -10,16 +10,6 @@ let { ui } = global; * @return {Internal.Http} */ module.exports = function (scriptRuntime, scope) { - - const PFile = org.autojs.autojs.pio.PFile; - const Request = okhttp3.Request; - const RequestBody = okhttp3.RequestBody; - const MultipartBody = okhttp3.MultipartBody; - const MediaType = okhttp3.MediaType; - const FormBody = okhttp3.FormBody; - const Callback = okhttp3.Callback; - const MimeTypeMap = android.webkit.MimeTypeMap; - let _ = { Http: (/* @IIFE */ () => { /** diff --git a/app/src/main/assets/modules/__images__.js b/app/src/main/assets/modules/__images__.js index a5a7be2dd..57963855e 100644 --- a/app/src/main/assets/modules/__images__.js +++ b/app/src/main/assets/modules/__images__.js @@ -16,15 +16,8 @@ module.exports = function (scriptRuntime, scope) { const Scalar = org.opencv.core.Scalar; const Size = org.opencv.core.Size; const Core = org.opencv.core.Core; - const Imgproc = org.opencv.imgproc.Imgproc; - const Gravity = android.view.Gravity; - const Mat = org.autojs.autojs.core.opencv.Mat; const Images = org.autojs.autojs.runtime.api.Images; - const ColorDetector = org.autojs.autojs.core.image.ColorDetector; const ScreenCapturer = org.autojs.autojs.core.image.capture.ScreenCapturer; - const Bitmap = android.graphics.Bitmap; - const BitmapFactory = android.graphics.BitmapFactory; - const ByteArrayOutputStream = java.io.ByteArrayOutputStream; const RtImages = org.autojs.autojs.runtime.api.Images; /** @@ -592,7 +585,7 @@ module.exports = function (scriptRuntime, scope) { } // noinspection UnnecessaryLocalVariableJS /** @type Images.TemplateMatch[] */ - let results = scriptRuntime.bridges.getBridges().toArray(list); + let results = scriptRuntime.bridges.toArray(list); return results; })(), get points() { diff --git a/app/src/main/assets/modules/__notice__.js b/app/src/main/assets/modules/__notice__.js index 5692bfedf..892cea952 100644 --- a/app/src/main/assets/modules/__notice__.js +++ b/app/src/main/assets/modules/__notice__.js @@ -7,13 +7,7 @@ */ module.exports = function (scriptRuntime, scope) { - const AppUtils = org.autojs.autojs.runtime.api.AppUtils; - const NotificationUtils = org.autojs.autojs.util.NotificationUtils; - const NotificationCompat = androidx.core.app.NotificationCompat; const Builder = androidx.core.app.NotificationCompat.Builder; - const BigTextStyle = androidx.core.app.NotificationCompat.BigTextStyle; - const Notification = android.app.Notification; - const NotificationManager = android.app.NotificationManager; // @Caution by SuperMonster003 on May 6, 2023. // ! On device running with Android 7.x, diff --git a/app/src/main/assets/modules/__ocr__.js b/app/src/main/assets/modules/__ocr__.js index ca1d3ae3d..550e95c69 100644 --- a/app/src/main/assets/modules/__ocr__.js +++ b/app/src/main/assets/modules/__ocr__.js @@ -116,7 +116,7 @@ module.exports = function (scriptRuntime, scope) { // @Signature recognizeText(img: ImageWrapper, region: OmniRegion): string[]; // @Overload recognizeText(img: ImageWrapper, options: DetectOptionsMLKit | DetectOptionsPaddle): string[]; - return this.recognizeText(img, { region: arguments[1] }); + return this.recognizeText(arguments[0], { region: arguments[1] }); } // @Signature recognizeText(img: ImageWrapper, options?: DetectOptionsMLKit | DetectOptionsPaddle): string[]; @@ -186,7 +186,7 @@ module.exports = function (scriptRuntime, scope) { // @Signature detect(img: ImageWrapper, region: OmniRegion): org.autojs.autojs.runtime.api.OcrResult[]; // @Overload detect(img: ImageWrapper, options: DetectOptionsMLKit | DetectOptionsPaddle): org.autojs.autojs.runtime.api.OcrResult[]; - return this.detect(img, { region: arguments[1] }); + return this.detect(/* img */ arguments[0], { region: arguments[1] }); } // @Signature detect(img: ImageWrapper, options?: DetectOptionsMLKit | DetectOptionsPaddle): org.autojs.autojs.runtime.api.OcrResult[]; diff --git a/app/src/main/assets/modules/__threads__.js b/app/src/main/assets/modules/__threads__.js index 0bdc065a4..236dd39c1 100644 --- a/app/src/main/assets/modules/__threads__.js +++ b/app/src/main/assets/modules/__threads__.js @@ -6,7 +6,6 @@ * @return {Internal.Threads} */ module.exports = function (scriptRuntime, scope) { - const Throwable = java.lang.Throwable; const Synchronizer = org.mozilla.javascript.Synchronizer; const TimerThread = org.autojs.autojs.core.looper.TimerThread; diff --git a/app/src/main/assets/modules/__ui__.js b/app/src/main/assets/modules/__ui__.js index 5439203c2..cb9d0f3d6 100644 --- a/app/src/main/assets/modules/__ui__.js +++ b/app/src/main/assets/modules/__ui__.js @@ -10,16 +10,8 @@ let { files } = global; * @return {Internal.UI} */ module.exports = function (scriptRuntime, scope) { - const Looper = android.os.Looper; - const Runnable = java.lang.Runnable; - const ContextThemeWrapper = android.view.ContextThemeWrapper; const ViewExtras = org.autojs.autojs.core.ui.ViewExtras; - const JsListView = org.autojs.autojs.core.ui.widget.JsListView; - const JsGridView = org.autojs.autojs.core.ui.widget.JsGridView; const JsViewHelper = org.autojs.autojs.core.ui.JsViewHelper; - const ThemeColor = org.autojs.autojs.theme.ThemeColor; - const DynamicLayoutInflater = org.autojs.autojs.core.ui.inflater.DynamicLayoutInflater; - const ColorDrawable = android.graphics.drawable.ColorDrawable; require('object-observe-lite.min').call(scope); require('array-observe.min').call(scope); diff --git a/app/src/main/assets/modules/__util__.js b/app/src/main/assets/modules/__util__.js index 79c1995d7..a6f458776 100644 --- a/app/src/main/assets/modules/__util__.js +++ b/app/src/main/assets/modules/__util__.js @@ -27,10 +27,8 @@ * @return {Internal.Util} */ module.exports = function (scriptRuntime, scope) { - const Build = android.os.Build; const Arrays = java.util.Arrays; const HashMap = java.util.HashMap; - const JavaUtils = org.autojs.autojs.util.JavaUtils; let _ = { Util: (/* @IIFE */ () => { @@ -1141,6 +1139,12 @@ module.exports = function (scriptRuntime, scope) { return ret; } + if (!isNullish(value) && typeof value.getClass === 'function') { + if (value.getClass() === UiObjectCollection) { + return value.toString(); + } + } + if (isJavaClass(value)) { return `[JavaClass ${util.getClassName(value)}]`; } diff --git a/app/src/main/assets/modules/jvm-npm.js b/app/src/main/assets/modules/jvm-npm.js index 3836713c8..293b973fb 100644 --- a/app/src/main/assets/modules/jvm-npm.js +++ b/app/src/main/assets/modules/jvm-npm.js @@ -19,10 +19,8 @@ /* jshint evil: true */ ( /* @ModuleIIFE */ () => { - const File = java.io.File; const Scanner = java.util.Scanner; const System = java.lang.System; - const Thread = java.lang.Thread; let _ = { Module: (/* @IIFE */ () => { diff --git a/app/src/main/assets/modules/result-adapter.js b/app/src/main/assets/modules/result-adapter.js index f790e3072..3930073c1 100644 --- a/app/src/main/assets/modules/result-adapter.js +++ b/app/src/main/assets/modules/result-adapter.js @@ -1,6 +1,4 @@ ( /* @ModuleIIFE */ () => { - const Looper = android.os.Looper; - let _ = { isUiThread() { return Looper.myLooper() === Looper.getMainLooper(); diff --git "a/app/src/main/assets/sample/OCR/PaddleOCR (\345\206\205\347\275\256API).js" "b/app/src/main/assets/sample/OCR/PaddleOCR (\345\206\205\347\275\256API).js" new file mode 100644 index 000000000..2a7745a20 --- /dev/null +++ "b/app/src/main/assets/sample/OCR/PaddleOCR (\345\206\205\347\275\256API).js" @@ -0,0 +1,26 @@ +/** + * @author TonyJiangWJ + */ +!function internalApiForPaddleOcr() { + console.show(); + + // 指定是否用精简版模型, 速度较快, 默认为 true + let useSlim = false; + + // CPU 线程数量, 实际好像没啥作用 + let cpuThreadNum = 4; + + let start = new Date(); + let img = images.read('test.png'); + let results = ocr.paddle.detect(img, { useSlim, cpuThreadNum }); + + toastLog(`识别结束, 耗时: ${new Date() - start}ms`); + + log(`识别结果: ${JSON.stringify( + Array.from(results).map((result) => { + return { label: result.label, confidence: result.confidence, bounds: result.bounds }; + }))}`); + + // 回收图片 + img.recycle(); +}(); \ No newline at end of file diff --git "a/app/src/main/assets/sample/OCR/PaddleOCR (\345\216\237\345\247\213\347\261\273).js" "b/app/src/main/assets/sample/OCR/PaddleOCR (\345\216\237\345\247\213\347\261\273).js" new file mode 100644 index 000000000..c16dbc2ae --- /dev/null +++ "b/app/src/main/assets/sample/OCR/PaddleOCR (\345\216\237\345\247\213\347\261\273).js" @@ -0,0 +1,54 @@ +/** + * @author TonyJiangWJ + */ +!function originalClassesForPaddleOcr() { + const Predictor = com.baidu.paddle.lite.ocr.Predictor; + + console.show(); + + // 指定是否用精简版模型 速度较快 + let useSlim = false; + + // 创建检测器 + let predictor = new Predictor(); + + // predictor.cpuThreadNum = 4 //可以自定义使用CPU的线程数 + // predictor.checkModelLoaded = false // 可以自定义是否需要校验模型是否成功加载 默认开启 使用内置Base64图片进行校验 识别测试文本来校验模型是否加载成功 + + // 初始化模型 首次运行时会比较耗时 + let loading = threads.disposable(); + + // 建议在新线程中初始化模型 + threads.start(function () { + loading.setAndNotify(predictor.init(context, useSlim)); + // loading.setAndNotify(predictor.init(context)) 为默认不使用精简版 + // 内置默认 modelPath 为 models/ocr_v3_for_cpu,初始化自定义模型请写绝对路径否则无法获取到 + // 内置默认 labelPath 为 labels/ppocr_keys_v1.txt + // let modelPath = files.path('./models/customize') // 指定自定义模型路径 + // let labelPath = files.path('./models/customize') // 指定自定义label路径 + // 使用自定义模型时det rec cls三个模型文件名称需要手动指定 + // predictor.detModelFilename = 'det_opt.nb' + // predictor.recModelFilename = 'rec_opt.nb' + // predictor.clsModelFilename = 'cls_opt.nb' + // loading.setAndNotify(predictor.init(context, modelPath, labelPath)) + }); + + let loadSuccess = loading.blockedGet(); + toastLog(`加载模型结果:${loadSuccess}`); + + let start = new Date(); + let img = images.read('test.png'); + let results = predictor.runOcr(img.getBitmap()); + + toastLog(`识别结束, 耗时:${new Date() - start}ms`); + + log(`识别结果: ${JSON.stringify(results.toArray().map((result) => { + return { label: result.label, confidence: result.confidence, bounds: result.bounds }; + }))}`); + + // 释放模型 用于释放native内存 非必需 + // predictor.releaseModel() + + // 回收图片 + img.recycle(); +}(); \ No newline at end of file diff --git "a/app/src/main/assets/sample/OCR/PaddleOCR (\346\210\252\345\233\276\350\257\206\345\210\253).js" "b/app/src/main/assets/sample/OCR/PaddleOCR (\346\210\252\345\233\276\350\257\206\345\210\253).js" new file mode 100644 index 000000000..0ced119ee --- /dev/null +++ "b/app/src/main/assets/sample/OCR/PaddleOCR (\346\210\252\345\233\276\350\257\206\345\210\253).js" @@ -0,0 +1,198 @@ +/** + * create by TonyJiangWJ + */ +!function sampleForPaddleOcr() { + + const Predictor = com.baidu.paddle.lite.ocr.Predictor; + + let currentEngine = engines.myEngine(); + let runningEngines = engines.all(); + let currentSource = `${currentEngine.getSource()}`; + if (runningEngines.length > 1) { + runningEngines.forEach(compareEngine => { + let compareSource = `${compareEngine.getSource()}`; + if (currentEngine.getId() !== compareEngine.getId() && compareSource === currentSource) { + // 强制关闭同名的脚本 + compareEngine.forceStop(); + } + }); + } + + if (!requestScreenCapture()) { + toastLog('请求截图权限失败'); + exit(); + } + + sleep(1000); + + // 指定是否用精简版模型 速度较快 + let useSlim = true; + + // 创建检测器 + let predictor = new Predictor(); + + // predictor.cpuThreadNum = 4 // 可以自定义使用CPU的线程数 + // predictor.checkModelLoaded = false // 可以自定义是否需要校验模型是否成功加载 默认开启 使用内置Base64图片进行校验 识别测试文本来校验模型是否加载成功 + + // 初始化模型 首次运行时会比较耗时 + let loading = threads.disposable(); + + // 建议在新线程中初始化模型 + threads.start(function () { + loading.setAndNotify(predictor.init(context, useSlim)); + // loading.setAndNotify(predictor.init(context)) 为默认不使用精简版 + // 内置默认 modelPath 为 models/ocr_v3_for_cpu,初始化自定义模型请写绝对路径否则无法获取到 + // 内置默认 labelPath 为 labels/ppocr_keys_v1.txt + // let modelPath = files.path('./models/customize') // 指定自定义模型路径 + // let labelPath = files.path('./models/customize') // 指定自定义label路径 + // 使用自定义模型时det rec cls三个模型文件名称需要手动指定 + // predictor.detModelFilename = 'det_opt.nb' + // predictor.recModelFilename = 'rec_opt.nb' + // predictor.clsModelFilename = 'cls_opt.nb' + // loading.setAndNotify(predictor.init(context, modelPath, labelPath)) + }); + let loadSuccess = loading.blockedGet(); + if (!loadSuccess) { + toastLog('初始化ocr失败'); + exit(); + } + + // 识别结果和截图信息 + let result = []; + let img = null; + let running = true; + let capturing = true; + + /** + * 截图并识别OCR文本信息 + */ + function captureAndOcr() { + capturing = true; + img && img.recycle(); + img = captureScreen(); + if (!img) { + toastLog('截图失败'); + } + let start = new Date(); + result = predictor.runOcr(img.getBitmap()); + toastLog(`耗时${new Date() - start}ms`); + capturing = false; + } + + captureAndOcr(); + + // 获取状态栏高度 + let offset = -getStatusBarHeightCompat(); + + // 绘制识别结果 + let window = floaty.rawWindow( + , + ); + + // 设置悬浮窗位置 + ui.post(() => { + window.setPosition(0, offset); + window.setSize(device.width, device.height); + window.setTouchable(false); + }); + + // 操作按钮 + let clickButtonWindow = floaty.rawWindow( + +