6.0.2 - 新增images.bilateralFilter() 修复toast多次调用/客户端及服务端模式开关/安卓7无法使用UI模式 部分插件及工具版本更新

This commit is contained in:
SuperMonster003 committed 2022-02-05 16:45:25 +08:00
1 parent 3ce51e4a01
commit ec61eb5000
40 files changed
+922 -766

No files matched your search

+28 -5
View File
@@ -26,6 +26,7 @@
### 简介 ### 简介
* Android 平台支持无障碍服务的 JavaScript 自动化工具 * Android 平台支持无障碍服务的 JavaScript 自动化工具
* 需要 [Android 7.0](https://zh.wikipedia.org/wiki/Android_Nougat) (`API 24`) 及以上
* 复刻 (Fork) 自 [hyb1996/Auto.js](https://github.com/hyb1996/Auto.js) * 复刻 (Fork) 自 [hyb1996/Auto.js](https://github.com/hyb1996/Auto.js)
****** ******
@@ -53,7 +54,7 @@
* 支持将脚本文件或项目打包为 APK 文件 * 支持将脚本文件或项目打包为 APK 文件
* 支持利用 Root 权限扩展功能 (屏幕点击/滑动/录制/Shell) * 支持利用 Root 权限扩展功能 (屏幕点击/滑动/录制/Shell)
* 支持作为 Tasker 插件使用 * 支持作为 Tasker 插件使用
* 支持与 VSCode 连接并进行桌面开发 (需要 [AutoJs6-VSCode-Ext](https://github.com/SuperMonster003/AutoJs6-VSCode-Ext) 插件) * 支持与 VSCode 连接并进行桌面开发 (需要 [AutoJs6-VSCode-Extension](https://github.com/SuperMonster003/AutoJs6-VSCode-Extension) 插件)
****** ******
@@ -61,7 +62,10 @@
****** ******
* Rhino 引擎由 [v1.7.7.2](https://github.com/mozilla/rhino/releases/tag/Rhino1_7_7_2_Release) 升级至 [v1.7.14 (SNAPSHOT)](https://github.com/mozilla/rhino/) * VSCode 插件支持客户端 (LAN) 及服务端 (LAN/ADB) 连接方式
* Rhino 引擎由 [v1.7.7.2](https://github.com/mozilla/rhino/releases/tag/Rhino1_7_7_2_Release) 升级至 [v1.7.14](https://github.com/mozilla/rhino/)
* 支持 [Object.values()](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Object/values) * 支持 [Object.values()](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Object/values)
@@ -99,6 +103,25 @@
[comment]: <> "Version history only shows last 3 versions" [comment]: <> "Version history only shows last 3 versions"
# v6.0.2
###### 2022/02/05
* `新增` images.bilateralFilter() 双边滤波图像处理方法
* `修复` 多次调用 toast 只生效最后一次调用的问题
* `修复` toast.dismiss() 可能无效的问题
* `修复` 客户端模式及服务端模式开关可能无法正常工作的问题
* `修复` 客户端模式及服务端模式开关状态不能正常刷新的问题
* `修复` Android 7 解析 UI 模式 text 元素异常 (Ref to TonyJiangWJ) _[`issue #4`](https://github.com/SuperMonster003/AutoJs6/issues/4)_
* `优化` 忽略 sleep() 的 ScriptInterruptedException 异常
* `优化` 附加 Androidx AppCompat (Legacy) 版本 1.0.2
* `优化` 升级 Androidx AppCompat 版本 1.4.0 -> 1.4.1
* `优化` 升级 Androidx Preference 版本 1.1.1 -> 1.2.0
* `优化` 升级 Okhttp3 版本 3.10.0 -> 5.0.0-alpha.3 -> 5.0.0-alpha.4
* `优化` 升级 Android Material 版本 1.6.0-alpha01 -> 1.6.0-alpha02
* `优化` 升级 Android Gradle 插件版本 7.2.0-alpha06 -> 7.2.0-beta01
* `优化` 升级 Gradle 发行版本 7.3.3 -> 7.4-rc-2
# v6.0.1 # v6.0.1
###### 2022/01/01 ###### 2022/01/01
@@ -190,11 +213,11 @@
****** ******
* [AutoJs6-VSCode-Ext](https://github.com/SuperMonster003/AutoJs6-VSCode-Ext) { author: [SuperMonster003](https://github.com/SuperMonster003) } * [AutoJs6-VSCode-Extension](https://github.com/SuperMonster003/AutoJs6-VSCode-Extension) { author: [SuperMonster003](https://github.com/SuperMonster003) }
- `适用于 VSCode 的桌面开发插件 (二次开发项目)` - `适用于 VSCode 的桌面开发插件 (二次开发项目)`
* [AutoX](https://github.com/kkevsekk1/AutoX) { author: [kkevsekk1](https://github.com/kkevsekk1) } * [AutoX](https://github.com/kkevsekk1/AutoX) { author: [kkevsekk1](https://github.com/kkevsekk1) }
- `安卓平台 JavaScript 自动化工具 (二次开发项目)` - `安卓平台 JavaScript 自动化工具 (二次开发项目)`
[//]: # (* [Auto.js-TypeScript-Declarations]&#40;https://github.com/SuperMonster003/Auto.js-TypeScript-Declarations&#41; { author: [SuperMonster003]&#40;https://github.com/SuperMonster003&#41; }) [comment]: <> (* [Auto.js-TypeScript-Declarations]&#40;https://github.com/SuperMonster003/Auto.js-TypeScript-Declarations&#41; { author: [SuperMonster003]&#40;https://github.com/SuperMonster003&#41; })
[//]: # ( - `Auto.js 声明文件 &#40;.d.ts&#41;`) [comment]: <> ( - `Auto.js 声明文件 &#40;.d.ts&#41;`)
+68 -81
View File
@@ -1,16 +1,12 @@
plugins { plugins {
id "com.android.application" id 'com.android.application'
id "com.jakewharton.butterknife" id 'com.jakewharton.butterknife'
id "kotlin-android" id 'kotlin-android'
id "kotlin-kapt" id 'kotlin-kapt'
} }
def annotationsVer = "4.8.0"
def butterKnifeVer = "10.2.3"
def leakcanaryVer = "2.7"
def properties = new Properties() def properties = new Properties()
def propFile = new File("sign.properties") def propFile = new File('sign.properties')
def isPropFileExists = propFile.exists() def isPropFileExists = propFile.exists()
isPropFileExists && properties.load(new FileInputStream(propFile)) isPropFileExists && properties.load(new FileInputStream(propFile))
@@ -22,32 +18,32 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
} }
// tasks.withType(JavaCompile) { // tasks.withType(JavaCompile) {
// options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked" // options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked'
// } // }
android { android {
signingConfigs { signingConfigs {
isPropFileExists && release { isPropFileExists && release {
storeFile file(properties["storeFile"]) storeFile file(properties['storeFile'])
keyPassword properties["keyPassword"] keyPassword properties['keyPassword']
keyAlias properties["keyAlias"] keyAlias properties['keyAlias']
storePassword properties["storePassword"] storePassword properties['storePassword']
} }
} }
compileSdkVersion versions.compile compileSdkVersion versions.project.compile
defaultConfig { defaultConfig {
applicationId "org.autojs.autojs" applicationId 'org.autojs.autojs'
minSdkVersion versions.mini minSdkVersion versions.project.mini
targetSdkVersion versions.target targetSdkVersion versions.project.target
versionCode versions.appVersionCode versionCode versions.project.appVersionCode
versionName versions.appVersionName versionName versions.project.appVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
multiDexEnabled true multiDexEnabled true
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
arguments = [ arguments = [
"resourcePackageName": applicationId, 'resourcePackageName': applicationId,
"androidManifestFile": "$projectDir/src/main/AndroidManifest.xml".toString() 'androidManifestFile': "$projectDir/src/main/AndroidManifest.xml".toString()
] ]
} }
} }
@@ -56,7 +52,7 @@ android {
debug { debug {
shrinkResources false shrinkResources false
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
if (isPropFileExists) { if (isPropFileExists) {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
@@ -68,7 +64,7 @@ android {
release { release {
shrinkResources false shrinkResources false
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
if (isPropFileExists) { if (isPropFileExists) {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
@@ -77,17 +73,17 @@ android {
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_16 sourceCompatibility JavaVersion.VERSION_16
targetCompatibility JavaVersion.VERSION_16 targetCompatibility JavaVersion.VERSION_16
encoding = "utf-8" encoding = 'utf-8'
} }
lintOptions { lintOptions {
abortOnError false abortOnError false
disable "MissingTranslation" disable 'MissingTranslation'
disable "ExtraTranslation" disable 'ExtraTranslation'
} }
configurations.all { configurations.all {
resolutionStrategy.force "com.google.code.findbugs:jsr305:3.0.1" resolutionStrategy.force 'com.google.code.findbugs:jsr305:3.0.1'
} }
flavorDimensions "channel" flavorDimensions 'channel'
splits { splits {
// Configures multiple APKs based on ABI. // Configures multiple APKs based on ABI.
abi { abi {
@@ -101,7 +97,7 @@ android {
reset() reset()
// Specifies a list of ABIs that Gradle should create APKs for. // Specifies a list of ABIs that Gradle should create APKs for.
include "armeabi-v7a" include 'x86', 'armeabi-v7a'
// Specifies that we do not want to also generate a universal APK that includes all ABIs. // Specifies that we do not want to also generate a universal APK that includes all ABIs.
universalApk false universalApk false
@@ -109,14 +105,14 @@ android {
} }
productFlavors { productFlavors {
common { common {
buildConfigField "String", "CHANNEL", "\"common\"" buildConfigField 'String', 'CHANNEL', '"common"'
buildConfigField "String", "APP_SINCE_DATE", "\"${versions.appSinceDate}\"" buildConfigField 'String', 'APP_SINCE_DATE', "\"${versions.project.appSinceDate}\""
} }
} }
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.mergeAssetsProvider.configure { variant.mergeAssetsProvider.configure {
doLast { doLast {
delete(fileTree(dir: outputDir, includes: ["declarations/**"])) delete(fileTree(dir: outputDir, includes: ['declarations/**']))
} }
} }
} }
@@ -128,103 +124,94 @@ repositories {
dependencies { dependencies {
// JUnit // JUnit
testImplementation "junit:junit:${junitVer}" testImplementation "junit:junit:${versions.junit}"
// LeakCanary // LeakCanary
debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanaryVer}" debugImplementation "com.squareup.leakcanary:leakcanary-android:${versions.leakcanary}"
// Kotlin // Kotlin
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-native-mt" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-native-mt'
// Android Annotations // Android Annotations
kapt "org.androidannotations:androidannotations:${annotationsVer}" kapt "org.androidannotations:androidannotations:${versions.annotations}"
implementation "org.androidannotations:androidannotations-api:${annotationsVer}" implementation "org.androidannotations:androidannotations-api:${versions.annotations}"
// ButterKnife // ButterKnife
kapt "com.jakewharton:butterknife-compiler:${butterKnifeVer}" kapt "com.jakewharton:butterknife-compiler:${versions.butterKnife}"
implementation "com.jakewharton:butterknife:${butterKnifeVer}" implementation "com.jakewharton:butterknife:${versions.butterKnife}"
// Android supports // Android supports
implementation "androidx.appcompat:appcompat:1.4.0" implementation 'androidx.cardview:cardview:1.0.0'
implementation "androidx.cardview:cardview:1.0.0" implementation 'androidx.multidex:multidex:2.0.1'
implementation "com.google.android.material:material:1.6.0-alpha01"
implementation "androidx.multidex:multidex:2.0.1"
// Material Dialogs
implementation "com.afollestad.material-dialogs:core:0.9.6.0"
// SwipeRefreshLayout // SwipeRefreshLayout
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
// Common Markdown // Common Markdown
implementation "com.github.atlassian:commonmark-java:commonmark-parent-0.9.0" implementation 'com.github.atlassian:commonmark-java:commonmark-parent-0.9.0'
// Android issue reporter (a github issue reporter) // Android issue reporter (a github issue reporter)
implementation "com.heinrichreimersoftware:android-issue-reporter:1.3.1" implementation 'com.heinrichreimersoftware:android-issue-reporter:1.3.1'
// MultiLevelListView // MultiLevelListView
implementation "com.github.hyb1996:android-multi-level-listview:1.1" implementation 'com.github.hyb1996:android-multi-level-listview:1.1'
// Licenses Dialog // Licenses Dialog
implementation "de.psdev.licensesdialog:licensesdialog:2.2.0" implementation 'de.psdev.licensesdialog:licensesdialog:2.2.0'
// Expandable RecyclerView // Expandable RecyclerView
implementation "com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1" implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'
// FlexibleDivider // FlexibleDivider
implementation "com.yqritc:recyclerview-flexibledivider:1.4.0" implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0'
// AVLoadingView // AVLoadingView
implementation "com.wang.avi:library:2.1.3" implementation 'com.wang.avi:library:2.1.3'
// Commons Lang // Commons Lang
implementation "org.apache.commons:commons-lang3:3.12.0" implementation 'org.apache.commons:commons-lang3:3.12.0'
// Expandable RecyclerView // Expandable RecyclerView
implementation "com.thoughtbot:expandablerecyclerview:1.3" implementation 'com.thoughtbot:expandablerecyclerview:1.3'
implementation "com.github.hyb1996:Auto.js-ApkBuilder:1.0.1" implementation 'com.github.hyb1996:Auto.js-ApkBuilder:1.0.1'
// RxJava // RxJava
implementation "io.reactivex.rxjava2:rxjava:2.2.21" implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation "io.reactivex.rxjava2:rxandroid:2.1.1" implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
// Retrofit // Retrofit
implementation "com.squareup.retrofit2:retrofit:2.9.0" implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation "com.squareup.retrofit2:converter-gson:2.9.0" implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation "com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0" implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
implementation "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2" implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
// Glide // Glide
kapt "com.github.bumptech.glide:compiler:4.12.0" kapt "com.github.bumptech.glide:compiler:${versions.glide}"
implementation "com.github.bumptech.glide:glide:4.12.0"
// Joda Time // Joda Time
implementation "joda-time:joda-time:2.10.13" implementation 'joda-time:joda-time:2.10.13'
// Tasker Plugin // Tasker Plugin
implementation "com.twofortyfouram:android-plugin-client-sdk-for-locale:4.0.3" implementation 'com.twofortyfouram:android-plugin-client-sdk-for-locale:4.0.3'
// Flurry // Flurry
implementation "com.flurry.android:analytics:13.1.0" implementation 'com.flurry.android:analytics:13.1.0'
// Material Dialogs
implementation "com.afollestad.material-dialogs:commons:0.9.6.0"
// Android Job // Android Job
implementation "com.evernote:android-job:1.4.2" implementation 'com.evernote:android-job:1.4.2'
// Extracted from com.github.hyb1996:MutableTheme:1.0.0 // Extracted from com.github.hyb1996:MutableTheme:1.0.0
implementation "com.jrummyapps:colorpicker:2.1.7" implementation 'com.jrummyapps:colorpicker:2.1.7'
implementation "androidx.recyclerview:recyclerview:1.2.1" implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation "com.github.ozodrukh:CircularReveal:2.0.1" implementation 'com.github.ozodrukh:CircularReveal:2.0.1'
// Bugly // Bugly
implementation project(":libs:com.tencent.bugly.crashreport-2.6.6") implementation project(':libs:com.tencent.bugly.crashreport-2.6.6')
implementation project(":automator") implementation project(':automator')
implementation project(":common") implementation project(':common')
implementation project(":autojs") implementation project(':autojs')
} }
java { java {
+19
View File
@@ -4,6 +4,25 @@
****** ******
# v6.0.2
###### 2022/02/05
* `新增` images.bilateralFilter() 双边滤波图像处理方法
* `修复` 多次调用 toast 只生效最后一次调用的问题
* `修复` toast.dismiss() 可能无效的问题
* `修复` 客户端模式及服务端模式开关可能无法正常工作的问题
* `修复` 客户端模式及服务端模式开关状态不能正常刷新的问题
* `修复` Android 7 解析 UI 模式 text 元素异常 (Ref to TonyJiangWJ) _[`issue #4`](https://github.com/SuperMonster003/AutoJs6/issues/4)_
* `优化` 忽略 sleep() 的 ScriptInterruptedException 异常
* `优化` 附加 Androidx AppCompat (Legacy) 版本 1.0.2
* `优化` 升级 Androidx AppCompat 版本 1.4.0 -> 1.4.1
* `优化` 升级 Androidx Preference 版本 1.1.1 -> 1.2.0
* `优化` 升级 Okhttp3 版本 3.10.0 -> 5.0.0-alpha.3 -> 5.0.0-alpha.4
* `优化` 升级 Android Material 版本 1.6.0-alpha01 -> 1.6.0-alpha02
* `优化` 升级 Android Gradle 插件版本 7.2.0-alpha06 -> 7.2.0-beta01
* `优化` 升级 Gradle 发行版本 7.3.3 -> 7.4-rc-2
# v6.0.1 # v6.0.1
###### 2022/01/01 ###### 2022/01/01
+1 -1
View File
@@ -961,7 +961,7 @@
<li>如果想要在电脑而不是手机上开发Auto.js,可以使用VS Code以及相应的Auto.js插件使得在电脑上编辑的脚本能推送到手机运行,参见<a href="https://github.com/hyb1996/Auto.js-VSCode-Extension">Auto.js-VSCode-Extension</a>。</li> <li>如果想要在电脑而不是手机上开发Auto.js,可以使用VS Code以及相应的Auto.js插件使得在电脑上编辑的脚本能推送到手机运行,参见<a href="https://github.com/hyb1996/Auto.js-VSCode-Extension">Auto.js-VSCode-Extension</a>。</li>
</ul> </ul>
<p>本文档的章节大致上是以模块来分的,总体上可以分成&quot;自动操作&quot;类模块(控件操作、触摸模拟、按键模拟等)和其他类模块(设备、应用、界面等)。</p> <p>本文档的章节大致上是以模块来分的,总体上可以分成&quot;自动操作&quot;类模块(控件操作、触摸模拟、按键模拟等)和其他类模块(设备、应用、界面等)。</p>
<p>&quot;自动操作&quot;的部分又可以大致分为基于控件和基于坐标的操作。基于坐标的操作是传统按键精灵、触摸精灵等脚本软件采用的方式,通过屏幕坐标来点击、长按指定位置模拟操作,从而到达目的。例如<code>click(100, 200)</code>, <code>press(100, 200, 500)</code>等。这种方式在游戏类脚本中比较有可行性,结合找图找色、坐标放缩功能也能达到较好的兼容性。但是,这种方式对一般软件脚本却难以达到想要的效果,而且这种方式需要安卓7.0版本以上或者root权限才能执行。所以对于一般软件脚本(例如批量添加联系人、自动提取短信验证码等等),我们采用基于控件的模拟操作方式,结合通知事情、按键事情等达成更好的工作流。这些部分的文档参见<a href="widgets-based-automation.html">基于控件的操作</a>和<a href="coordinates-based-automation.html">基于坐标的操作</a>。</p> <p>&quot;自动操作&quot;的部分又可以大致分为基于控件和基于坐标的操作。基于坐标的操作是传统按键精灵、触摸精灵等脚本软件采用的方式,通过屏幕坐标来点击、长按指定位置模拟操作,从而到达目的。例如<code>click(100, 200)</code>, <code>press(100, 200, 500)</code>等。这种方式在游戏类脚本中比较有可行性,结合找图找色、坐标放缩功能也能达到较好的兼容性。但是,这种方式对一般软件脚本却难以达到想要的效果,而且这种方式需要root权限才能执行。所以对于一般软件脚本(例如批量添加联系人、自动提取短信验证码等等),我们采用基于控件的模拟操作方式,结合通知事情、按键事情等达成更好的工作流。这些部分的文档参见<a href="widgets-based-automation.html">基于控件的操作</a>和<a href="coordinates-based-automation.html">基于坐标的操作</a>。</p>
<p>其他部分主要包括:</p> <p>其他部分主要包括:</p>
<ul> <ul>
<li>app: 应用。启动应用,卸载应用,使用应用查看、编辑文件、访问网页,发送应用间广播等。</li> <li>app: 应用。启动应用,卸载应用,使用应用查看、编辑文件、访问网页,发送应用间广播等。</li>
+1 -1
View File
@@ -88,7 +88,7 @@
<li>如果想要在电脑而不是手机上开发Auto.js,可以使用VS Code以及相应的Auto.js插件使得在电脑上编辑的脚本能推送到手机运行,参见<a href="https://github.com/hyb1996/Auto.js-VSCode-Extension">Auto.js-VSCode-Extension</a>。</li> <li>如果想要在电脑而不是手机上开发Auto.js,可以使用VS Code以及相应的Auto.js插件使得在电脑上编辑的脚本能推送到手机运行,参见<a href="https://github.com/hyb1996/Auto.js-VSCode-Extension">Auto.js-VSCode-Extension</a>。</li>
</ul> </ul>
<p>本文档的章节大致上是以模块来分的,总体上可以分成&quot;自动操作&quot;类模块(控件操作、触摸模拟、按键模拟等)和其他类模块(设备、应用、界面等)。</p> <p>本文档的章节大致上是以模块来分的,总体上可以分成&quot;自动操作&quot;类模块(控件操作、触摸模拟、按键模拟等)和其他类模块(设备、应用、界面等)。</p>
<p>&quot;自动操作&quot;的部分又可以大致分为基于控件和基于坐标的操作。基于坐标的操作是传统按键精灵、触摸精灵等脚本软件采用的方式,通过屏幕坐标来点击、长按指定位置模拟操作,从而到达目的。例如<code>click(100, 200)</code>, <code>press(100, 200, 500)</code>等。这种方式在游戏类脚本中比较有可行性,结合找图找色、坐标放缩功能也能达到较好的兼容性。但是,这种方式对一般软件脚本却难以达到想要的效果,而且这种方式需要安卓7.0版本以上或者root权限才能执行。所以对于一般软件脚本(例如批量添加联系人、自动提取短信验证码等等),我们采用基于控件的模拟操作方式,结合通知事情、按键事情等达成更好的工作流。这些部分的文档参见<a href="widgets-based-automation.html">基于控件的操作</a>和<a href="coordinates-based-automation.html">基于坐标的操作</a>。</p> <p>&quot;自动操作&quot;的部分又可以大致分为基于控件和基于坐标的操作。基于坐标的操作是传统按键精灵、触摸精灵等脚本软件采用的方式,通过屏幕坐标来点击、长按指定位置模拟操作,从而到达目的。例如<code>click(100, 200)</code>, <code>press(100, 200, 500)</code>等。这种方式在游戏类脚本中比较有可行性,结合找图找色、坐标放缩功能也能达到较好的兼容性。但是,这种方式对一般软件脚本却难以达到想要的效果,而且这种方式需要root权限才能执行。所以对于一般软件脚本(例如批量添加联系人、自动提取短信验证码等等),我们采用基于控件的模拟操作方式,结合通知事情、按键事情等达成更好的工作流。这些部分的文档参见<a href="widgets-based-automation.html">基于控件的操作</a>和<a href="coordinates-based-automation.html">基于坐标的操作</a>。</p>
<p>其他部分主要包括:</p> <p>其他部分主要包括:</p>
<ul> <ul>
<li>app: 应用。启动应用,卸载应用,使用应用查看、编辑文件、访问网页,发送应用间广播等。</li> <li>app: 应用。启动应用,卸载应用,使用应用查看、编辑文件、访问网页,发送应用间广播等。</li>
@@ -32,6 +32,9 @@ import org.autojs.autojs.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow
import org.autojs.autojs.ui.log.LogActivity_; import org.autojs.autojs.ui.log.LogActivity_;
import org.autojs.autojs.ui.settings.SettingsActivity_; import org.autojs.autojs.ui.settings.SettingsActivity_;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/** /**
* Created by Stardust on 2017/4/2. * Created by Stardust on 2017/4/2.
@@ -41,11 +44,13 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
private static AutoJs instance; private static AutoJs instance;
// @Thank to Zen2H
private final ExecutorService printExecutor = Executors.newSingleThreadExecutor();
public static AutoJs getInstance() { public static AutoJs getInstance() {
return instance; return instance;
} }
public synchronized static void initInstance(Application application) { public synchronized static void initInstance(Application application) {
if (instance != null) { if (instance != null) {
return; return;
@@ -108,11 +113,18 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
@Override @Override
protected GlobalConsole createGlobalConsole() { protected GlobalConsole createGlobalConsole() {
DevPluginService devPluginService = DevPluginService.getInstance();
return new GlobalConsole(getUiHandler()) { return new GlobalConsole(getUiHandler()) {
@Override @Override
public String println(int level, CharSequence charSequence) { public String println(int level, CharSequence charSequence) {
String log = super.println(level, charSequence); String log = super.println(level, charSequence);
new Thread(() -> DevPluginService.getInstance().print(log)).start();
// FIXME by SuperMonster003 on Feb 2, 2022
// ! When running in 'ui' thread (`ui.run`, `ui.post`),
// ! android.os.NetworkOnMainThreadException may happen.
// ! Further more, dunno if a thread executor is a good idea.
printExecutor.submit(() -> devPluginService.print(log));
return log; return log;
} }
}; };
@@ -80,7 +80,7 @@ public class DevPluginService {
private volatile JsonSocketClient mJsonSocketClient; private volatile JsonSocketClient mJsonSocketClient;
private volatile JsonSocketServer mJsonSocketServer; private volatile JsonSocketServer mJsonSocketServer;
private volatile ServerSocket mAJServerSocket; private volatile ServerSocket mServerSocket;
public DevPluginService() { public DevPluginService() {
File cache = new File(GlobalAppContext.get().getCacheDir(), "remote_project"); File cache = new File(GlobalAppContext.get().getCacheDir(), "remote_project");
@@ -97,6 +97,11 @@ public class DevPluginService {
return mJsonSocketServer; return mJsonSocketServer;
} }
@Nullable
public ServerSocket getServerSocket() {
return mServerSocket;
}
@AnyThread @AnyThread
public Observable<JsonSocketClient> connectToRemoteServer(String host) { public Observable<JsonSocketClient> connectToRemoteServer(String host) {
int port = Port.PC_SERVER; int port = Port.PC_SERVER;
@@ -135,11 +140,11 @@ public class DevPluginService {
.doOnNext(jsonSocketServer -> { .doOnNext(jsonSocketServer -> {
try { try {
mJsonSocketServer = jsonSocketServer; mJsonSocketServer = jsonSocketServer;
mAJServerSocket = jsonSocketServer.getServerSocket(); mServerSocket = jsonSocketServer.getServerSocket();
if (mAJServerSocket != null) { if (mServerSocket != null) {
jsonSocketServer jsonSocketServer
.setStateConnected() .setStateConnected()
.setSocket(mAJServerSocket.accept()) .setSocket(mServerSocket.accept())
.subscribeMessage() .subscribeMessage()
.monitorMessage() .monitorMessage()
.sayHello(); .sayHello();
@@ -21,7 +21,6 @@ import com.stardust.autojs.runtime.api.Device;
import com.stardust.util.MapBuilder; import com.stardust.util.MapBuilder;
import org.autojs.autojs.BuildConfig; import org.autojs.autojs.BuildConfig;
import org.autojs.autojs.tool.IOTool;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
@@ -196,13 +195,12 @@ abstract public class JsonSocket extends Socket {
public void monitorMessage(Socket socket, JsonSocket jsonSocket) { public void monitorMessage(Socket socket, JsonSocket jsonSocket) {
new Thread(() -> { new Thread(() -> {
InputStream inputStream = null; // try (AutoCloseable) { ... }
InputStreamReader inputStreamReader = null; // @Thank to Zen2H
BufferedReader bufferedReader = null; try (InputStream inputStream = socket.getInputStream();
try { InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
inputStream = socket.getInputStream(); BufferedReader bufferedReader = new BufferedReader(inputStreamReader)
inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8); ) {
bufferedReader = new BufferedReader(inputStreamReader);
final StringBuilder stringBuilder = new StringBuilder(); final StringBuilder stringBuilder = new StringBuilder();
String readLine; String readLine;
Log.d(TAG, "bufferedReader is reading lines..."); Log.d(TAG, "bufferedReader is reading lines...");
@@ -216,9 +214,6 @@ abstract public class JsonSocket extends Socket {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
IOTool.close(bufferedReader);
IOTool.close(inputStreamReader);
IOTool.close(inputStream);
try { try {
jsonSocket.switchOff(); jsonSocket.switchOff();
} catch (IOException e) { } catch (IOException e) {
@@ -12,6 +12,8 @@ import com.google.gson.JsonObject;
import java.io.IOException; import java.io.IOException;
import java.net.Socket; import java.net.Socket;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.subjects.PublishSubject; import io.reactivex.subjects.PublishSubject;
@@ -20,6 +22,8 @@ public class JsonSocketClient extends JsonSocket {
private static final String TAG = JsonSocketClient.class.getSimpleName(); private static final String TAG = JsonSocketClient.class.getSimpleName();
private final ExecutorService jsonSocketExecutor = Executors.newSingleThreadExecutor();
public static final PublishSubject<DevPluginService.State> cxnState = PublishSubject.create(); public static final PublishSubject<DevPluginService.State> cxnState = PublishSubject.create();
private final PublishSubject<JsonElement> mJsonElementPublishSubject = PublishSubject.create(); private final PublishSubject<JsonElement> mJsonElementPublishSubject = PublishSubject.create();
@@ -32,14 +36,14 @@ public class JsonSocketClient extends JsonSocket {
// @Constructor // @Constructor
public JsonSocketClient(String host, int port) { public JsonSocketClient(String host, int port) {
new Thread(() -> { jsonSocketExecutor.submit(() -> {
try { try {
setStateConnecting(); setStateConnecting();
mSocket = new Socket(host, port); mSocket = new Socket(host, port);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
}).start(); });
} }
public boolean isSocketReady() { public boolean isSocketReady() {
@@ -80,6 +84,7 @@ public class JsonSocketClient extends JsonSocket {
mSocket.close(); mSocket.close();
mSocket = null; mSocket = null;
} }
jsonSocketExecutor.shutdown();
} }
@Override @Override
@@ -12,8 +12,8 @@ public class ThreadTool {
try { try {
//noinspection BusyWait //noinspection BusyWait
Thread.sleep(200); Thread.sleep(200);
} catch (InterruptedException e) { } catch (InterruptedException ignore) {
e.printStackTrace(); // ignored
} }
} }
result.set(true); result.set(true);
@@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process;
import android.view.Gravity; import android.view.Gravity;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@@ -185,7 +186,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
stopService(new Intent(view.getContext(), FloatyService.class)); stopService(new Intent(view.getContext(), FloatyService.class));
AutoJs.getInstance().getScriptEngineService().stopAll(); AutoJs.getInstance().getScriptEngineService().stopAll();
finish(); finish();
Runtime.getRuntime().exit(0); Process.killProcess(Process.myPid());
} }
@Click(R.id.restart) @Click(R.id.restart)
@@ -199,7 +200,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
} }
Intent mainIntent = Intent.makeRestartActivityTask(componentName); Intent mainIntent = Intent.makeRestartActivityTask(componentName);
context.startActivity(mainIntent); context.startActivity(mainIntent);
Runtime.getRuntime().exit(0); Process.killProcess(Process.myPid());
} }
@Override @Override
@@ -52,6 +52,7 @@ import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import java.io.IOException; import java.io.IOException;
import java.net.ServerSocket;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
@@ -408,33 +409,58 @@ public class DrawerFragment extends androidx.fragment.app.Fragment {
} }
private void toggleRemoteServerCxn(DrawerMenuItemViewHolder holder) throws IOException { private void toggleRemoteServerCxn(DrawerMenuItemViewHolder holder) {
JsonSocketClient jsonSocketClient = devPlugin.getJsonSocketClient(); boolean isChecked = holder.getSwitchCompat().isChecked();
boolean disconnected = jsonSocketClient == null || !jsonSocketClient.isSocketReady(); boolean isDisconnected = !isJsonSocketClientConnected();
boolean checked = holder.getSwitchCompat().isChecked(); if (isChecked && isDisconnected) {
if (checked) {
if (disconnected) {
inputRemoteHost(); inputRemoteHost();
}
} else { } else {
if (jsonSocketClient != null) { disconnectJsonSocketClientIFN();
jsonSocketClient.switchOff();
} }
} }
private void disconnectJsonSocketClientIFN() {
JsonSocketClient client = devPlugin.getJsonSocketClient();
if (client != null) {
try {
client.switchOff();
} catch (IOException e) {
e.printStackTrace();
}
}
}
private boolean isJsonSocketClientConnected() {
JsonSocketClient client = devPlugin.getJsonSocketClient();
return client != null && client.isSocketReady();
} }
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
private void toggleLocalServerCxn(DrawerMenuItemViewHolder holder) throws IOException { private void toggleLocalServerCxn(DrawerMenuItemViewHolder holder) {
JsonSocketServer jsonSocketServer = devPlugin.getJsonSocketServer(); boolean isChecked = holder.getSwitchCompat().isChecked();
boolean checked = holder.getSwitchCompat().isChecked(); boolean isDisconnected = !isServerSocketConnected();
if (checked) { if (isChecked && isDisconnected) {
devPlugin.enableLocalServer() devPlugin
.enableLocalServer()
.subscribe(Observers.emptyConsumer(), this::onAJServerConnectException); .subscribe(Observers.emptyConsumer(), this::onAJServerConnectException);
} else { } else {
if (jsonSocketServer != null) { disconnectServerSocketIFN();
jsonSocketServer.switchOff(); }
}
private boolean isServerSocketConnected() {
ServerSocket serverSocket = devPlugin.getServerSocket();
return serverSocket != null && !serverSocket.isClosed();
}
private void disconnectServerSocketIFN() {
ServerSocket serverSocket = devPlugin.getServerSocket();
if (serverSocket != null) {
try {
serverSocket.close();
} catch (IOException e) {
e.printStackTrace();
} }
} }
} }
@@ -511,6 +537,8 @@ public class DrawerFragment extends androidx.fragment.app.Fragment {
setChecked(mDisplayOverOtherAppsItem, FloatingPermission.canDrawOverlays(context)); setChecked(mDisplayOverOtherAppsItem, FloatingPermission.canDrawOverlays(context));
setChecked(mWriteSystemSettingsItem, Settings.System.canWrite(getContext())); setChecked(mWriteSystemSettingsItem, Settings.System.canWrite(getContext()));
setChecked(mWriteSecuritySettingsItem, hasWriteSecureSettingsAccess()); setChecked(mWriteSecuritySettingsItem, hasWriteSecureSettingsAccess());
setChecked(mClientModeItem, isJsonSocketClientConnected());
setChecked(mServerModeItem, isServerSocketConnected());
} }
private boolean isAccessibilityServiceEnabled() { private boolean isAccessibilityServiceEnabled() {
@@ -10,9 +10,11 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.CheckBox; import android.widget.CheckBox;
@@ -65,8 +67,8 @@ public class ShortcutCreateActivity extends AppCompatActivity {
private void showDialog() { private void showDialog() {
View view = View.inflate(this, R.layout.shortcut_create_dialog, null); View view = View.inflate(this, R.layout.shortcut_create_dialog, null);
ButterKnife.bind(this, view); ButterKnife.bind(this, view);
mUseAndroidNShortcut.setVisibility(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ? mUseAndroidNShortcut.setVisibility(Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1
View.VISIBLE : View.GONE); ? View.VISIBLE : View.GONE);
mName.setText(mScriptFile.getSimplifiedName()); mName.setText(mScriptFile.getSimplifiedName());
new ThemeColorMaterialDialogBuilder(this) new ThemeColorMaterialDialogBuilder(this)
.customView(view, false) .customView(view, false)
@@ -90,7 +92,7 @@ public class ShortcutCreateActivity extends AppCompatActivity {
@SuppressLint("NewApi") //for fool android studio @SuppressLint("NewApi") //for fool android studio
private void createShortcut() { private void createShortcut() {
if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1 && mUseAndroidNShortcut.isChecked()) if ((Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1 && mUseAndroidNShortcut.isChecked())
|| Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
createShortcutByShortcutManager(); createShortcutByShortcutManager();
return; return;
@@ -132,7 +134,7 @@ public class ShortcutCreateActivity extends AppCompatActivity {
} }
@SuppressLint("CheckResult") @SuppressLint({"CheckResult", "MissingSuperCall"})
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode != RESULT_OK) { if (resultCode != RESULT_OK) {
@@ -158,9 +160,7 @@ public class ShortcutCreateActivity extends AppCompatActivity {
.subscribe((bitmap -> { .subscribe((bitmap -> {
mIcon.setImageBitmap(bitmap); mIcon.setImageBitmap(bitmap);
mIsDefaultIcon = false; mIsDefaultIcon = false;
}), error -> { }), error -> Log.e(LOG_TAG, "decode stream", error));
Log.e(LOG_TAG, "decode stream", error);
});
} }
} }
+20 -25
View File
@@ -1,6 +1,6 @@
plugins { plugins {
id "com.android.library" id 'com.android.library'
id "kotlin-android" id 'kotlin-android'
} }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
@@ -10,21 +10,21 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
} }
// tasks.withType(JavaCompile) { // tasks.withType(JavaCompile) {
// options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked" // options.compilerArgs << '-Xlint:deprecation' << '-Xlint:unchecked'
// } // }
android { android {
compileSdkVersion versions.compile compileSdkVersion versions.project.compile
defaultConfig { defaultConfig {
minSdkVersion versions.mini minSdkVersion versions.project.mini
targetSdkVersion versions.target targetSdkVersion versions.project.target
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
compileOptions { compileOptions {
@@ -41,32 +41,27 @@ repositories {
} }
dependencies { dependencies {
testImplementation "junit:junit:${junitVer}" testImplementation "junit:junit:${versions.junit}"
implementation "net.lingala.zip4j:zip4j:2.9.1" implementation 'net.lingala.zip4j:zip4j:2.9.1'
implementation "com.afollestad.material-dialogs:core:0.9.6.0"
implementation "com.google.android.material:material:1.6.0-alpha01"
// OkHttp // OkHttp
implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.3" implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.4'
// Gson // Gson
implementation "com.google.code.gson:gson:2.8.9" implementation 'com.google.code.gson:gson:2.8.9'
// Log4j // Log4j
implementation group: "de.mindpipe.android", name: "android-logging-log4j", version: "1.0.3" implementation 'de.mindpipe.android:android-logging-log4j:1.0.3'
implementation group: "log4j", name: "log4j", version: "1.2.17" implementation 'log4j:log4j:1.2.17'
// Terminal emulator // Terminal emulator
api project(":libs:jackpal.androidterm.libtermexec-1.0") api project(':libs:jackpal.androidterm.libtermexec-1.0')
api project(":libs:jackpal.androidterm.emulatorview-1.0.42") api project(':libs:jackpal.androidterm.emulatorview-1.0.42')
api project(":libs:jackpal.androidterm-1.0.70") api project(':libs:jackpal.androidterm-1.0.70')
api project(":libs:com.android.dx-1.7.0") api project(':libs:com.android.dx-1.7.0')
api project(":libs:org.mozilla.rhino-1.7.14")
api project(":libs:org.opencv-4.5.4")
api project(":common") api project(':common')
api project(":automator") api project(':automator')
} }
+58 -29
View File
@@ -1,6 +1,8 @@
let Looper = android.os.Looper; let Looper = android.os.Looper;
let Toast = android.widget.Toast; let Toast = android.widget.Toast;
let Runnable = java.lang.Runnable; let Runnable = java.lang.Runnable;
let ScriptInterruptedException = com.stardust.autojs.runtime.exception.ScriptInterruptedException;
let ReentrantLock = java.util.concurrent.locks.ReentrantLock;
module.exports = function (runtime, global) { module.exports = function (runtime, global) {
let _ = { let _ = {
@@ -54,6 +56,28 @@ module.exports = function (runtime, global) {
} }
return this.buildTypes.release; return this.buildTypes.release;
}, },
toasts: {
/**
* @type {android.widget.Toast[]}
*/
pool: [],
lock: new ReentrantLock(),
add(t) {
if (t instanceof Toast) {
this.lock.lock();
this.pool.push(t);
this.lock.unlock();
}
},
dismiss() {
this.lock.lock();
this.pool.forEach((t) => {
t.cancel();
});
this.pool.splice(0);
this.lock.unlock();
},
},
}; };
Object.assign(global, { Object.assign(global, {
@@ -62,29 +86,15 @@ module.exports = function (runtime, global) {
androidx: Packages.androidx, androidx: Packages.androidx,
toast(msg, is_long, is_forcible) { toast(msg, is_long, is_forcible) {
let $ = { let $ = {
cache: null, toast() {
toast(msg, is_long, is_forcible) {
this.init(arguments); this.init(arguments);
this.post(); this.show();
}, },
/** @param {IArguments} args */ init() {
init(args) {
let [msg, is_long, is_forcible] = args;
this.message = isNullish(msg) ? '' : msg.toString(); this.message = isNullish(msg) ? '' : msg.toString();
this.is_long = this.parseIsLong(is_long); this.is_long = this.parseIsLong(is_long);
this.is_forcible = is_forcible; this.is_forcible = is_forcible;
}, },
post() {
ui.post(() => {
new android.os.Handler(Looper.getMainLooper()).post(new Runnable({
run() {
$.is_forcible && $.dismiss();
$.cache = Toast.makeText(context, $.message, $.is_long);
$.show();
},
}));
});
},
parseIsLong(is_long) { parseIsLong(is_long) {
if (typeof is_long === 'number') { if (typeof is_long === 'number') {
return Number(!!is_long); return Number(!!is_long);
@@ -97,22 +107,23 @@ module.exports = function (runtime, global) {
} }
return 0; return 0;
}, },
dismiss() {
if (this.cache instanceof Toast) {
this.cache.cancel();
this.cache = null;
}
},
show() { show() {
this.cache.show(); ui.post(() => {
new android.os.Handler(Looper.getMainLooper()).post(new Runnable({
run() {
if ($.is_forcible) {
$.dismiss();
}
$.toastObj = Toast.makeText(context, $.message, $.is_long);
_.toasts.add($.toastObj);
$.toastObj.show();
},
}));
});
}, },
}; };
(function $LazY() { $.toast();
this.toast = $.toast.bind($);
this.toast.dismiss = () => $.dismiss();
return this.toast;
}.call(this)).apply(null, arguments);
}, },
toastLog(msg, is_long, is_forcible) { toastLog(msg, is_long, is_forcible) {
this.toast.apply(this, arguments); this.toast.apply(this, arguments);
@@ -136,7 +147,13 @@ module.exports = function (runtime, global) {
sleep(min, max) { sleep(min, max) {
if (this.trigger()) { if (this.trigger()) {
this.parseArgs(min, max); this.parseArgs(min, max);
try {
runtime.sleep(this.min + this.rand_bound); runtime.sleep(this.min + this.rand_bound);
} catch (e) {
if (!(e.javaException instanceof ScriptInterruptedException)) {
throw e;
}
}
} }
}, },
trigger() { trigger() {
@@ -262,5 +279,17 @@ module.exports = function (runtime, global) {
isReference(o) { isReference(o) {
return o === Object(o); return o === Object(o);
}, },
$bind() {
this.toast.dismiss = function () {
ui.post(() => {
new android.os.Handler(Looper.getMainLooper()).post(new Runnable({
run() {
_.toasts.dismiss();
},
}));
}); });
}; };
return this;
},
}.$bind());
};
+443 -414
View File
@@ -1,104 +1,128 @@
// noinspection NpmUsedModulesInstalled // noinspection NpmUsedModulesInstalled
const ResultAdapter = require('result_adapter');
const Point = org.opencv.core.Point; const Point = org.opencv.core.Point;
const Rect = org.opencv.core.Rect; const Rect = org.opencv.core.Rect;
const Scalar = org.opencv.core.Scalar; const Scalar = org.opencv.core.Scalar;
const Size = org.opencv.core.Size; const Size = org.opencv.core.Size;
const Core = org.opencv.core.Core; const Core = org.opencv.core.Core;
const Imgproc = org.opencv.imgproc.Imgproc; const Imgproc = org.opencv.imgproc.Imgproc;
const Gravity = android.view.Gravity;
const Mat = com.stardust.autojs.core.opencv.Mat; const Mat = com.stardust.autojs.core.opencv.Mat;
const Images = com.stardust.autojs.runtime.api.Images; const Images = com.stardust.autojs.runtime.api.Images;
const ColorDetector = com.stardust.autojs.core.image.ColorDetector;
const ScreenCapturer = com.stardust.autojs.core.image.capture.ScreenCapturer;
const DEF_COLOR_THRESHOLD = 4; const DEF_COLOR_THRESHOLD = 4;
module.exports = function (runtime, scope) { module.exports = function (runtime, scope) {
const ResultAdapter = require('result_adapter'); const colors = Object.assign(Object.create(runtime.colors), {
alpha(color) {
return _.parseColor(color) >>> 24;
},
red(color) {
return (_.parseColor(color) >> 16) & 0xFF;
},
green(color) {
return (_.parseColor(color) >> 8) & 0xFF;
},
blue(color) {
return _.parseColor(color) & 0xFF;
},
isSimilar(c1, c2, threshold, algorithm) {
let t = _.parseNumber(threshold, DEF_COLOR_THRESHOLD);
let c = _.parseColor(c2);
return _.getColorDetector(_.parseColor(c1), algorithm || 'diff', t)
.detectsColor(colors.red(c), colors.green(c), colors.blue(c));
},
});
const MatchingResult = (function $iiFe() { const MatchingResult = (function $iiFe() {
let comparators = { let comparators = {
'left': (l, r) => l.point.x - r.point.x, left: (l, r) => l.point.x - r.point.x,
'top': (l, r) => l.point.y - r.point.y, top: (l, r) => l.point.y - r.point.y,
'right': (l, r) => r.point.x - l.point.x, right: (l, r) => r.point.x - l.point.x,
'bottom': (l, r) => r.point.y - l.point.y, bottom: (l, r) => r.point.y - l.point.y,
}; };
function MatchingResult(list) { function MatchingResult(list) {
if (Array.isArray(list)) { this.matches = Array.isArray(list) ? list : runtime.bridges.getBridges().toArray(list);
this.matches = list;
} else { // @LazyGetter
this.matches = runtime.bridges.getBridges().toArray(list);
}
Object.defineProperty(this, 'points', { Object.defineProperty(this, 'points', {
get() { set(v) {
if (typeof this.__points__ === 'undefined') { Object.defineProperty(this, 'points', {value: v});
this.__points__ = this.matches.map(m => m.point);
}
return this.__points__;
}, },
get() {
return this.points = this.matches.map(m => m.point);
},
enumerable: true,
configurable: true,
}); });
} }
MatchingResult.prototype.first = function () { Object.assign(MatchingResult.prototype, {
first() {
return this.matches.length ? this.matches[0] : null; return this.matches.length ? this.matches[0] : null;
}; },
MatchingResult.prototype.last = function () { last() {
return this.matches.length ? this.matches[this.matches.length - 1] : null; return this.matches.length ? this.matches[this.matches.length - 1] : null;
}; },
MatchingResult.prototype.findMax = function (cmp) { findMax(cmp) {
if (!this.matches.length) { if (!this.matches.length) {
return null; return null;
} }
let target = this.matches[0]; let target = this.matches[0];
this.matches.forEach(m => target = cmp(target, m) > 0 ? m : target); this.matches.forEach(m => target = cmp(target, m) > 0 ? m : target);
return target; return target;
}; },
MatchingResult.prototype.leftmost = function () { leftmost() {
return this.findMax(comparators.left); return this.findMax(comparators.left);
}; },
MatchingResult.prototype.topmost = function () { topmost() {
return this.findMax(comparators.top); return this.findMax(comparators.top);
}; },
MatchingResult.prototype.rightmost = function () { rightmost() {
return this.findMax(comparators.right); return this.findMax(comparators.right);
}; },
MatchingResult.prototype.bottommost = function () { bottommost() {
return this.findMax(comparators.bottom); return this.findMax(comparators.bottom);
}; },
MatchingResult.prototype.worst = function () { worst() {
return this.findMax((l, r) => l.similarity - r.similarity); return this.findMax((l, r) => l.similarity - r.similarity);
}; },
MatchingResult.prototype.best = function () { best() {
return this.findMax((l, r) => r.similarity - l.similarity); return this.findMax((l, r) => r.similarity - l.similarity);
}; },
MatchingResult.prototype.sortBy = function (cmp) { sortBy(cmp) {
let comparatorFn = null; let comparatorFn = null;
if (typeof cmp === 'string') { if (typeof cmp === 'string') {
cmp.split('-').forEach((direction) => { cmp.split('-').forEach((direction) => {
let buildInFn = comparators[direction]; let buildInFn = comparators[direction];
if (!buildInFn) { if (!buildInFn) {
throw new Error('unknown direction \'' + direction + '\' in \'' + cmp + '\''); throw new Error(`unknown direction '${direction}' in '${cmp}'`);
} }
(function (fn) {
if (comparatorFn === null) { if (comparatorFn === null) {
comparatorFn = fn; comparatorFn = buildInFn;
} else { } else {
comparatorFn = (function (comparatorFn, fn) { comparatorFn = (function (comparatorFn, fn) {
return function (l, r) { return function (l, r) {
let cmpValue = comparatorFn(l, r); let cmpValue = comparatorFn(l, r);
return cmpValue === 0 ? fn(l, r) : cmpValue; return cmpValue === 0 ? fn(l, r) : cmpValue;
}; };
})(comparatorFn, fn); })(comparatorFn, buildInFn);
} }
})(buildInFn);
}); });
} else { } else {
comparatorFn = cmp; comparatorFn = cmp;
} }
let clone = this.matches.slice(); return new MatchingResult(this.matches.slice().sort(comparatorFn));
clone.sort(comparatorFn); },
return new MatchingResult(clone); });
};
return MatchingResult; return MatchingResult;
})(); })();
@@ -107,422 +131,425 @@ module.exports = function (runtime, scope) {
const colorFinder = rtImages.colorFinder; const colorFinder = rtImages.colorFinder;
function getColorDetector(color, algorithm, threshold) { const _ = {
switch (algorithm) { initIfNeeded() {
case 'rgb': rtImages.initOpenCvIfNeeded();
return new com.stardust.autojs.core.image.ColorDetector.RGBDistanceDetector(color, threshold); },
case 'equal': /**
return new com.stardust.autojs.core.image.ColorDetector.EqualityDetector(color); * @param {number} x
case 'diff': * @param {number} min
return new com.stardust.autojs.core.image.ColorDetector.DifferenceDetector(color, threshold); * @param {number} max
case 'rgb+': * @param {number} [def=0]
return new com.stardust.autojs.core.image.ColorDetector.WeightedRGBDistanceDetector(color, threshold); * @returns {number}
case 'hs': */
return new com.stardust.autojs.core.image.ColorDetector.HSDistanceDetector(color, threshold); clamp: (x, min, max, def) => {
return Math.min(Math.max(_.parseNumber(x, def), min), max);
},
requestScreenCapture(orientation) {
return ResultAdapter.wait(rtImages.requestScreenCapture(orientation));
},
/**
* @param {any} num
* @param {number|function():number} [def=0]
* @returns {number}
*/
parseNumber(num, def) {
return typeof num === 'number' ? num : typeof def === 'function' ? def() : def || 0;
},
/**
* @param {number|number[]} size
* @returns {org.opencv.core.Size}
*/
parseSize(size) {
let width, height;
if (!Array.isArray(size)) {
width = height = size;
} else {
if (size.length === 1) {
width = height = size[0];
} else {
[width, height] = size;
} }
throw new Error('Unknown algorithm: ' + algorithm); }
return new Size(width, height);
},
/**
* @param {number|string} color
* @returns {number}
*/
parseColor(color) {
if (typeof color === 'string') {
return colors.parseColor(color);
}
return color;
},
/**
* @param {number[]} point
* @returns {org.opencv.core.Point}
*/
parsePoint(point) {
let [x, y] = point;
return new Point(x, y);
},
parseQuality(q) {
return this.clamp(q, 0, 100, 100);
},
parseScalar(color, offset) {
let d = this.clamp(offset, -255, 255, 0);
return new Scalar(colors.red(color) + d, colors.green(color) + d, colors.blue(color) + d, colors.alpha(color));
},
parseScalars(color, threshold) {
let thd = this.clamp(threshold, 0, 255, 0);
return {
lowerBound: _.parseScalar(color, -thd),
upperBound: _.parseScalar(color, +thd),
};
},
parseBorderType(type) {
return Core['BORDER_' + (type || 'DEFAULT')];
},
/**
* @param {{
* threshold?: number,
* similarity?: number,
* }} options
* @param {number} [def]
* @returns {number}
*/
parseThreshold(options, def) {
let opt = options || {};
if (opt.similarity) {
return Math.trunc(255 * (1 - opt.similarity));
}
return opt.threshold || (def === undefined ? DEF_COLOR_THRESHOLD : def);
},
/**
* @param {{
* weakThreshold?: number,
* }} options
* @param {number} [def]
* @returns {number}
*/
parseWeakThreshold(options, def) {
let opt = options || {};
return opt.weakThreshold || def;
},
resize(img, mat, size, fx, fy, interpolation) {
Imgproc.resize(img.mat, mat, this.parseSize(0), fx, fy, Imgproc['INTER_' + (interpolation || 'LINEAR')]);
},
/**
* @param {com.stardust.autojs.core.image.ImageWrapper} img
* @param {{region?: number[]}} [o]
* @returns {?org.opencv.core.Rect}
*/
buildRegion(img, o) {
if (!o || !o.region) {
return null;
} }
function toPointArray(points) { let [x, y, w, h] = o.region;
x = _.parseNumber(x, 0);
y = _.parseNumber(y, 0);
w = _.parseNumber(w, () => img.getWidth() - x);
h = _.parseNumber(h, () => img.getHeight() - y);
return _.checkAndGetImageRect(new Rect(x, y, w, h), img);
},
/**
* @param {org.opencv.core.Point[]} points - Java Array
* @returns {org.opencv.core.Point[]}
*/
toPointArray(points) {
let arr = []; let arr = [];
for (let i = 0; i < points.length; i++) { for (let i = 0; i < points.length; i++) {
arr.push(points[i]); arr.push(points[i]);
} }
return arr; return arr;
}
function buildRegion(region, img) {
if (region === undefined) {
region = [];
}
let x = region[0] === undefined ? 0 : region[0];
let y = region[1] === undefined ? 0 : region[1];
let width = region[2] === undefined ? img.getWidth() - x : region[2];
let height = region[3] === undefined ? (img.getHeight() - y) : region[3];
let r = new Rect(x, y, width, height);
if (x < 0 || y < 0 || x + width > img.width || y + height > img.height) {
throw new Error('out of region: region = [' + [x, y, width, height] + '], image.size = [' + [img.width, img.height] + ']');
}
return r;
}
function parseColor(color) {
if (typeof color === 'string') {
color = colors.parseColor(color);
}
return color;
}
function newSize(size) {
if (!Array.isArray(size)) {
size = [size, size];
}
if (size.length === 1) {
size = [size[0], size[0]];
}
return new Size(size[0], size[1]);
}
function initIfNeeded() {
rtImages.initOpenCvIfNeeded();
}
const colors = Object.create(runtime.colors, {
alpha: {
value(color) {
color = parseColor(color);
return color >>> 24;
}, },
enumerable: true, /**
* @param {org.opencv.core.Rect} rect
* @param {com.stardust.autojs.core.image.ImageWrapper} img
* @returns {org.opencv.core.Rect}
*/
checkAndGetImageRect(rect, img) {
let {x, y, width, height} = rect;
if (x < 0) {
throw Error(`X of region must be non-negative rather than ${x}`);
}
if (y < 0) {
throw Error(`Y of region must be non-negative rather than ${y}`);
}
if (x + width > img.width) {
throw Error(`Width of region overstepped:\n${x} + ${width} > ${img.width}`);
}
if (y + height > img.height) {
throw Error(`Height of region overstepped:\n${y} + ${height} > ${img.height}`);
}
return rect;
}, },
red: { getColorDetector(color, algorithm, threshold) {
value(color) { switch (algorithm) {
color = parseColor(color); case 'rgb':
return (color >> 16) & 0xFF; return new ColorDetector.RGBDistanceDetector(color, threshold);
case 'equal':
return new ColorDetector.EqualityDetector(color);
case 'diff':
return new ColorDetector.DifferenceDetector(color, threshold);
case 'rgb+':
return new ColorDetector.WeightedRGBDistanceDetector(color, threshold);
case 'hs':
return new ColorDetector.HSDistanceDetector(color, threshold);
}
throw Error('Unknown algorithm for detector: ' + algorithm);
}, },
enumerable: true, };
},
green: {
value(color) {
color = parseColor(color);
return (color >> 8) & 0xFF;
},
enumerable: true,
},
blue: {
value(color) {
color = parseColor(color);
return color & 0xFF;
},
enumerable: true,
},
isSimilar: {
value(c1, c2, threshold, algorithm) {
c1 = parseColor(c1);
c2 = parseColor(c2);
threshold = threshold === undefined ? 4 : threshold;
algorithm = algorithm === undefined ? 'diff' : algorithm;
let colorDetector = getColorDetector(c1, algorithm, threshold);
return colorDetector.detectsColor(colors.red(c2), colors.green(c2), colors.blue(c2));
},
enumerable: true,
},
});
const images = () => void 0; const images = () => void 0;
images.requestScreenCapture = function (landscape) { const images_ext = {
let ScreenCapturer = com.stardust.autojs.core.image.capture.ScreenCapturer; requestScreenCapture(landscape) {
let orientation = ScreenCapturer.ORIENTATION_AUTO; switch (landscape) {
if (landscape === true) { case true:
orientation = ScreenCapturer.ORIENTATION_LANDSCAPE; return _.requestScreenCapture(ScreenCapturer.ORIENTATION_LANDSCAPE);
case false:
return _.requestScreenCapture(ScreenCapturer.ORIENTATION_PORTRAIT);
default:
return _.requestScreenCapture(ScreenCapturer.ORIENTATION_AUTO);
} }
if (landscape === false) { },
orientation = ScreenCapturer.ORIENTATION_PORTRAIT; save(img, path, format, quality) {
} return rtImages.save(img, path, format || 'png', _.parseQuality(quality));
return ResultAdapter.wait(rtImages.requestScreenCapture(orientation)); },
}; saveImage(img, path, format, quality) {
return this.save(img, path, format, quality);
images.save = function (img, path, format, quality) { },
format = format || 'png'; grayscale(img, dstCn) {
quality = quality === undefined ? 100 : quality; return this.cvtColor(img, 'BGR2GRAY', dstCn);
return rtImages.save(img, path, format, quality); },
}; threshold(img, threshold, maxVal, type) {
_.initIfNeeded();
images.saveImage = function (img, path, format, quality) {
return images.save(img, path, format, quality);
};
images.grayscale = function (img, dstCn) {
return images.cvtColor(img, 'BGR2GRAY', dstCn);
};
images.threshold = function (img, threshold, maxVal, type) {
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
type = type || 'BINARY'; Imgproc.threshold(img.mat, mat, threshold, maxVal, Imgproc['THRESH_' + (type || 'BINARY')]);
type = Imgproc['THRESH_' + type]; return this.matToImage(mat);
Imgproc.threshold(img.mat, mat, threshold, maxVal, type); },
return images.matToImage(mat); inRange(img, lowerBound, upperBound) {
}; _.initIfNeeded();
let dst = new Mat();
images.inRange = function (img, lowerBound, upperBound) { Core.inRange(img.mat, _.parseScalar(lowerBound), _.parseScalar(upperBound), dst);
initIfNeeded(); return this.matToImage(dst);
let lb = new Scalar(colors.red(lowerBound), colors.green(lowerBound), },
colors.blue(lowerBound), colors.alpha(lowerBound)); interval(img, color, threshold) {
let ub = new Scalar(colors.red(upperBound), colors.green(upperBound), _.initIfNeeded();
colors.blue(upperBound), colors.alpha(lowerBound)); let {lowerBound, upperBound} = _.parseScalars(color, threshold);
let bi = new Mat(); let dst = new Mat();
Core.inRange(img.mat, lb, ub, bi); Core.inRange(img.mat, lowerBound, upperBound, dst);
return images.matToImage(bi); return this.matToImage(dst);
}; },
adaptiveThreshold(img, maxValue, adaptiveMethod, thresholdType, blockSize, C) {
images.interval = function (img, color, threshold) { _.initIfNeeded();
initIfNeeded();
let lb = new Scalar(colors.red(color) - threshold, colors.green(color) - threshold,
colors.blue(color) - threshold, colors.alpha(color));
let ub = new Scalar(colors.red(color) + threshold, colors.green(color) + threshold,
colors.blue(color) + threshold, colors.alpha(color));
let bi = new Mat();
Core.inRange(img.mat, lb, ub, bi);
return images.matToImage(bi);
};
images.adaptiveThreshold = function (img, maxValue, adaptiveMethod, thresholdType, blockSize, C) {
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
adaptiveMethod = Imgproc['ADAPTIVE_THRESH_' + adaptiveMethod]; Imgproc.adaptiveThreshold(img.mat, mat, maxValue,
thresholdType = Imgproc['THRESH_' + thresholdType]; Imgproc['ADAPTIVE_THRESH_' + adaptiveMethod],
Imgproc.adaptiveThreshold(img.mat, mat, maxValue, adaptiveMethod, thresholdType, blockSize, C); Imgproc['THRESH_' + thresholdType], blockSize, C);
return images.matToImage(mat); return this.matToImage(mat);
},
}; blur(img, size, point, type) {
_.initIfNeeded();
images.blur = function (img, size, point, type) {
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
size = newSize(size);
type = Core['BORDER_' + (type || 'DEFAULT')];
if (point === undefined) { if (point === undefined) {
Imgproc.blur(img.mat, mat, size); Imgproc.blur(img.mat, mat, _.parseSize(size));
} else { } else {
Imgproc.blur(img.mat, mat, size, new Point(point[0], point[1]), type); Imgproc.blur(img.mat, mat, _.parseSize(size), _.parsePoint(point), _.parseBorderType(type));
} }
return images.matToImage(mat); return this.matToImage(mat);
}; },
medianBlur(img, size) {
images.medianBlur = function (img, size) { _.initIfNeeded();
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
Imgproc.medianBlur(img.mat, mat, size); Imgproc.medianBlur(img.mat, mat, size);
return images.matToImage(mat); return this.matToImage(mat);
}; },
gaussianBlur(img, size, sigmaX, sigmaY, type) {
images.gaussianBlur = function (img, size, sigmaX, sigmaY, type) { _.initIfNeeded();
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
size = newSize(size); let x = _.parseNumber(sigmaX);
sigmaX = sigmaX === undefined ? 0 : sigmaX; let y = _.parseNumber(sigmaY);
sigmaY = sigmaY === undefined ? 0 : sigmaY; Imgproc.GaussianBlur(img.mat, mat, _.parseSize(size), x, y, _.parseBorderType(type));
type = Core['BORDER_' + (type || 'DEFAULT')]; return this.matToImage(mat);
Imgproc.GaussianBlur(img.mat, mat, size, sigmaX, sigmaY, type); },
bilateralFilter(img, d, sigmaColor, sigmaSpace, borderType) {
_.initIfNeeded();
let mat = new Mat();
Imgproc.bilateralFilter(img.mat, mat,
_.parseNumber(d, 0),
_.parseNumber(sigmaColor, 40),
_.parseNumber(sigmaSpace, 20),
_.parseBorderType(borderType));
return images.matToImage(mat); return images.matToImage(mat);
}; },
cvtColor(img, code, dstCn) {
images.cvtColor = function (img, code, dstCn) { _.initIfNeeded();
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
code = Imgproc['COLOR_' + code];
if (dstCn === undefined) { if (dstCn === undefined) {
Imgproc.cvtColor(img.mat, mat, code); Imgproc.cvtColor(img.mat, mat, Imgproc['COLOR_' + code]);
} else { } else {
Imgproc.cvtColor(img.mat, mat, code, dstCn); Imgproc.cvtColor(img.mat, mat, Imgproc['COLOR_' + code], dstCn);
} }
return images.matToImage(mat); return this.matToImage(mat);
},
findCircles(grayImg, options) {
let $ = {
getResult() {
this.init();
this.parseArgs();
this.release();
return this.results;
},
init() {
_.initIfNeeded();
},
parseArgs() {
this.options = options || {};
this.region = this.options.region;
this.parseImage();
this.parseCircles();
},
parseImage() {
this.image = this.region
? new Mat(grayImg.mat, _.buildRegion(grayImg, this))
: grayImg.mat;
},
parseCircles() {
let cir = this.circles = new Mat();
Imgproc.HoughCircles(this.image, cir, Imgproc.CV_HOUGH_GRADIENT,
_.parseNumber(this.options['dp'], 1),
_.parseNumber(this.options['minDst'], () => grayImg.height / 8),
_.parseNumber(this.options['param1'], 100),
_.parseNumber(this.options['param2'], 100),
_.parseNumber(this.options['minRadius'], 0),
_.parseNumber(this.options['maxRadius'], 0),
);
this.results = [];
for (let i = 0; i < cir.rows(); i++) {
for (let j = 0; j < cir.cols(); j++) {
let [x, y, radius] = cir.get(i, j);
this.results.push({x, y, radius});
}
}
},
release() {
if (this.region) {
this.image.release();
}
this.circles.release();
},
}; };
images.findCircles = function (grayImg, options) { return $.getResult();
initIfNeeded(); },
options = options || {}; resize(img, size, interpolation) {
let mat = options.region === undefined ? grayImg.mat : new Mat(grayImg.mat, buildRegion(options.region, grayImg)); _.initIfNeeded();
let resultMat = new Mat();
let dp = options.dp === undefined ? 1 : options.dp;
let minDst = options.minDst === undefined ? grayImg.height / 8 : options.minDst;
let param1 = options.param1 === undefined ? 100 : options.param1;
let param2 = options.param2 === undefined ? 100 : options.param2;
let minRadius = options.minRadius === undefined ? 0 : options.minRadius;
let maxRadius = options.maxRadius === undefined ? 0 : options.maxRadius;
Imgproc.HoughCircles(mat, resultMat, Imgproc.CV_HOUGH_GRADIENT, dp, minDst, param1, param2, minRadius, maxRadius);
let result = [];
for (let i = 0; i < resultMat.rows(); i++) {
for (let j = 0; j < resultMat.cols(); j++) {
let d = resultMat.get(i, j);
result.push({
x: d[0],
y: d[1],
radius: d[2],
});
}
}
if (options.region !== undefined) {
mat.release();
}
resultMat.release();
return result;
};
images.resize = function (img, size, interpolation) {
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
interpolation = Imgproc['INTER_' + (interpolation || 'LINEAR')]; _.resize(img, mat, size, 0, 0, interpolation);
Imgproc.resize(img.mat, mat, newSize(size), 0, 0, interpolation); return this.matToImage(mat);
return images.matToImage(mat); },
}; scale(img, fx, fy, interpolation) {
_.initIfNeeded();
images.scale = function (img, fx, fy, interpolation) {
initIfNeeded();
let mat = new Mat(); let mat = new Mat();
interpolation = Imgproc['INTER_' + (interpolation || 'LINEAR')]; _.resize(img, mat, 0, fx, fy, interpolation);
Imgproc.resize(img.mat, mat, newSize([0, 0]), fx, fy, interpolation); return this.matToImage(mat);
return images.matToImage(mat); },
}; rotate(img, degree, x, y) {
_.initIfNeeded();
images.rotate = function (img, degree, x, y) { x = _.parseNumber(x, () => img.width / 2);
initIfNeeded(); y = _.parseNumber(y, () => img.height / 2);
if (x === undefined) {
x = img.width / 2;
}
if (y === undefined) {
y = img.height / 2;
}
return rtImages.rotate(img, x, y, degree); return rtImages.rotate(img, x, y, degree);
}; },
concat(img1, img2, direction) {
images.concat = function (img1, img2, direction) { _.initIfNeeded();
initIfNeeded(); return Images.concat(img1, img2, Gravity[(direction || 'right').toUpperCase()]);
direction = direction || 'right'; },
return Images.concat(img1, img2, android.view.Gravity[direction.toUpperCase()]); detectsColor(img, color, x, y, threshold, algorithm) {
}; _.initIfNeeded();
images.detectsColor = function (img, color, x, y, threshold, algorithm) {
initIfNeeded();
color = parseColor(color);
algorithm = algorithm || 'diff';
threshold = threshold || DEF_COLOR_THRESHOLD;
let colorDetector = getColorDetector(color, algorithm, threshold);
let pixel = images.pixel(img, x, y); let pixel = images.pixel(img, x, y);
return colorDetector.detectsColor(colors.red(pixel), colors.green(pixel), colors.blue(pixel)); return _.getColorDetector(_.parseColor(color), algorithm || 'diff', threshold || DEF_COLOR_THRESHOLD)
}; .detectsColor(colors.red(pixel), colors.green(pixel), colors.blue(pixel));
},
images.findColor = function (img, color, options) { findColor(img, color, options) {
initIfNeeded(); _.initIfNeeded();
color = parseColor(color); let opt = options || {};
options = options || {}; return colorFinder.findColor(img, _.parseColor(color), _.parseThreshold(opt), _.buildRegion(img, opt));
let region = options.region || []; },
let threshold = function $iiFe() { findColorInRegion(img, color, x, y, width, height, threshold) {
if (options.similarity) { return this.findColor(img, color, {
return parseInt(255 * (1 - options.similarity));
}
return options.threshold || DEF_COLOR_THRESHOLD;
}();
if (options.region) {
return colorFinder.findColor(img, color, threshold, buildRegion(region, img));
} else {
return colorFinder.findColor(img, color, threshold, null);
}
};
images.findColorInRegion = function (img, color, x, y, width, height, threshold) {
return findColor(img, color, {
region: [x, y, width, height], region: [x, y, width, height],
threshold: threshold, threshold: threshold,
}); });
}; },
findColorEquals(img, color, x, y, width, height) {
images.findColorEquals = function (img, color, x, y, width, height) { return this.findColor(img, color, {
return findColor(img, color, {
region: [x, y, width, height], region: [x, y, width, height],
threshold: 0, threshold: 0,
}); });
}; },
findAllPointsForColor(img, color, options) {
images.findAllPointsForColor = function (img, color, options) { _.initIfNeeded();
initIfNeeded(); let opt = options || {};
color = parseColor(color); return _.toPointArray(colorFinder.findAllPointsForColor(img, _.parseColor(color), _.parseThreshold(opt), _.buildRegion(img, opt)));
options = options || {}; },
let threshold = function $iiFe() { findMultiColors(img, firstColor, paths, options) {
if (options.similarity) { _.initIfNeeded();
return parseInt(255 * (1 - options.similarity));
}
return options.threshold || DEF_COLOR_THRESHOLD;
}();
if (options.region) {
return toPointArray(colorFinder.findAllPointsForColor(img, color, threshold, buildRegion(options.region, img)));
} else {
return toPointArray(colorFinder.findAllPointsForColor(img, color, threshold, null));
}
};
images.findMultiColors = function (img, firstColor, paths, options) {
initIfNeeded();
options = options || {};
firstColor = parseColor(firstColor);
let list = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, paths.length * 3); let list = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, paths.length * 3);
for (let i = 0; i < paths.length; i++) { for (let i = 0; i < paths.length; i++) {
let p = paths[i]; let [x, y, color] = paths[i];
list[i * 3] = p[0]; list[i * 3] = x;
list[i * 3 + 1] = p[1]; list[i * 3 + 1] = y;
list[i * 3 + 2] = parseColor(p[2]); list[i * 3 + 2] = _.parseColor(color);
} }
let region = options.region ? buildRegion(options.region, img) : null; let opt = options || {};
let threshold = options.threshold === undefined ? DEF_COLOR_THRESHOLD : options.threshold; return colorFinder.findMultiColors(img, _.parseColor(firstColor), _.parseThreshold(opt), _.buildRegion(img, opt), list);
return colorFinder.findMultiColors(img, firstColor, threshold, region, list); },
}; findImage(img, template, options) {
_.initIfNeeded();
images.findImage = function (img, template, options) { let opt = options || {};
initIfNeeded(); return rtImages.findImage(img, template,
options = options || {}; _.parseWeakThreshold(opt, 0.6),
let threshold = options.threshold || 0.9; _.parseThreshold(opt, 0.9),
let maxLevel = -1; _.buildRegion(img, opt),
if (typeof options.level === 'number') { _.parseNumber(opt.level, -1));
maxLevel = options.level; },
} matchTemplate(img, template, options) {
let weakThreshold = options.weakThreshold || 0.6; _.initIfNeeded();
if (options.region) { let opt = options || {};
return rtImages.findImage(img, template, weakThreshold, threshold, buildRegion(options.region, img), maxLevel); return new MatchingResult(rtImages.matchTemplate(img, template,
} else { _.parseWeakThreshold(opt, 0.6),
return rtImages.findImage(img, template, weakThreshold, threshold, null, maxLevel); _.parseThreshold(opt, 0.9),
} _.buildRegion(img, opt),
}; _.parseNumber(opt.level, -1),
_.parseNumber(opt.max, 5)));
images.matchTemplate = function (img, template, options) { },
initIfNeeded(); findImageInRegion(img, template, x, y, width, height, threshold) {
options = options || {}; return this.findImage(img, template, {
let threshold = options.threshold || 0.9;
let maxLevel = -1;
if (typeof options.level === 'number') {
maxLevel = options.level;
}
let max = options.max || 5;
let weakThreshold = options.weakThreshold || 0.6;
let result;
if (options.region) {
result = rtImages.matchTemplate(img, template, weakThreshold, threshold, buildRegion(options.region, img), maxLevel, max);
} else {
result = rtImages.matchTemplate(img, template, weakThreshold, threshold, null, maxLevel, max);
}
return new MatchingResult(result);
};
images.findImageInRegion = function (img, template, x, y, width, height, threshold) {
return images.findImage(img, template, {
region: [x, y, width, height], region: [x, y, width, height],
threshold: threshold, threshold: threshold,
}); });
}; },
fromBase64(base64) {
images.fromBase64 = function (base64) {
return rtImages.fromBase64(base64); return rtImages.fromBase64(base64);
}; },
toBase64(img, format, quality) {
images.toBase64 = function (img, format, quality) { return rtImages.toBase64(img, format || 'png', _.parseQuality(quality));
format = format || 'png'; },
quality = quality === undefined ? 100 : quality; fromBytes(bytes) {
return rtImages.toBase64(img, format, quality);
};
images.fromBytes = function (bytes) {
return rtImages.fromBytes(bytes); return rtImages.fromBytes(bytes);
}; },
toBytes(img, format, quality) {
images.toBytes = function (img, format, quality) { return rtImages.toBytes(img, format || 'png', _.parseQuality(quality));
format = format || 'png'; },
quality = quality === undefined ? 100 : quality; readPixels(path) {
return rtImages.toBytes(img, format, quality);
};
images.readPixels = function (path) {
let img = images.read(path); let img = images.read(path);
let bitmap = img.getBitmap(); let bitmap = img.getBitmap();
let w = bitmap.getWidth(); let w = bitmap.getWidth();
@@ -535,12 +562,14 @@ module.exports = function (runtime, scope) {
width: w, width: w,
height: h, height: h,
}; };
},
matToImage(img) {
_.initIfNeeded();
return Image.ofMat(img);
},
}; };
images.matToImage = function (img) { Object.assign(images, images_ext);
initIfNeeded();
return Image.ofMat(img);
};
util.__assignFunctions__(rtImages, images, ['captureScreen', 'read', 'copy', 'load', 'clip', 'pixel']); util.__assignFunctions__(rtImages, images, ['captureScreen', 'read', 'copy', 'load', 'clip', 'pixel']);
@@ -6,7 +6,6 @@ import android.graphics.Rect
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
import android.view.accessibility.AccessibilityNodeInfo import android.view.accessibility.AccessibilityNodeInfo
import androidx.annotation.RequiresApi
import com.stardust.autojs.annotation.ScriptInterface import com.stardust.autojs.annotation.ScriptInterface
import com.stardust.autojs.runtime.ScriptRuntime import com.stardust.autojs.runtime.ScriptRuntime
import com.stardust.autojs.runtime.accessibility.AccessibilityConfig import com.stardust.autojs.runtime.accessibility.AccessibilityConfig
@@ -41,7 +40,6 @@ class SimpleActionAutomator(private val mAccessibilityBridge: AccessibilityBridg
return ActionTarget.BoundsActionTarget(Rect(left, top, right, bottom)) return ActionTarget.BoundsActionTarget(Rect(left, top, right, bottom))
} }
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@ScriptInterface @ScriptInterface
fun editable(i: Int): ActionTarget { fun editable(i: Int): ActionTarget {
ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP) ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP)
@@ -104,14 +102,12 @@ class SimpleActionAutomator(private val mAccessibilityBridge: AccessibilityBridg
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
fun setText(target: ActionTarget, text: String): Boolean { fun setText(target: ActionTarget, text: String): Boolean {
ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP) ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP)
return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SET_TEXT, text)) return performAction(target.createAction(AccessibilityNodeInfo.ACTION_SET_TEXT, text))
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
fun appendText(target: ActionTarget, text: String): Boolean { fun appendText(target: ActionTarget, text: String): Boolean {
ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP) ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP)
return performAction(target.createAction(UiObject.ACTION_APPEND_TEXT, text)) return performAction(target.createAction(UiObject.ACTION_APPEND_TEXT, text))
@@ -128,7 +124,6 @@ class SimpleActionAutomator(private val mAccessibilityBridge: AccessibilityBridg
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
fun powerDialog(): Boolean { fun powerDialog(): Boolean {
ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP) ScriptRuntime.requiresApi(Build.VERSION_CODES.LOLLIPOP)
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG) return performGlobalAction(AccessibilityService.GLOBAL_ACTION_POWER_DIALOG)
@@ -150,33 +145,27 @@ class SimpleActionAutomator(private val mAccessibilityBridge: AccessibilityBridg
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.N)
fun splitScreen(): Boolean { fun splitScreen(): Boolean {
return performGlobalAction(AccessibilityService.GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN) return performGlobalAction(AccessibilityService.GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN)
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.N)
fun gesture(start: Long, duration: Long, vararg points: IntArray): Boolean { fun gesture(start: Long, duration: Long, vararg points: IntArray): Boolean {
prepareForGesture() prepareForGesture()
return mGlobalActionAutomator.gesture(start, duration, *points) return mGlobalActionAutomator.gesture(start, duration, *points)
} }
@RequiresApi(api = Build.VERSION_CODES.N)
fun gestureAsync(start: Long, duration: Long, vararg points: IntArray) { fun gestureAsync(start: Long, duration: Long, vararg points: IntArray) {
prepareForGesture() prepareForGesture()
mGlobalActionAutomator.gestureAsync(start, duration, *points) mGlobalActionAutomator.gestureAsync(start, duration, *points)
} }
@RequiresApi(api = Build.VERSION_CODES.N)
fun gestures(strokes: Any): Boolean { fun gestures(strokes: Any): Boolean {
prepareForGesture() prepareForGesture()
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
return mGlobalActionAutomator.gestures(*strokes as Array<GestureDescription.StrokeDescription>) return mGlobalActionAutomator.gestures(*strokes as Array<GestureDescription.StrokeDescription>)
} }
//如果这里用GestureDescription.StrokeDescription[]为参数,安卓7.0以下会因为找不到这个类而报错
@RequiresApi(api = Build.VERSION_CODES.N)
fun gesturesAsync(strokes: Any) { fun gesturesAsync(strokes: Any) {
prepareForGesture() prepareForGesture()
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
@@ -195,28 +184,24 @@ class SimpleActionAutomator(private val mAccessibilityBridge: AccessibilityBridg
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.N)
fun click(x: Int, y: Int): Boolean { fun click(x: Int, y: Int): Boolean {
prepareForGesture() prepareForGesture()
return mGlobalActionAutomator.click(x, y) return mGlobalActionAutomator.click(x, y)
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.N)
fun press(x: Int, y: Int, delay: Int): Boolean { fun press(x: Int, y: Int, delay: Int): Boolean {
prepareForGesture() prepareForGesture()
return mGlobalActionAutomator.press(x, y, delay) return mGlobalActionAutomator.press(x, y, delay)
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.N)
fun longClick(x: Int, y: Int): Boolean { fun longClick(x: Int, y: Int): Boolean {
prepareForGesture() prepareForGesture()
return mGlobalActionAutomator.longClick(x, y) return mGlobalActionAutomator.longClick(x, y)
} }
@ScriptInterface @ScriptInterface
@RequiresApi(api = Build.VERSION_CODES.N)
fun swipe(x1: Int, y1: Int, x2: Int, y2: Int, delay: Int): Boolean { fun swipe(x1: Int, y1: Int, x2: Int, y2: Int, delay: Int): Boolean {
prepareForGesture() prepareForGesture()
return mGlobalActionAutomator.swipe(x1, y1, x2, y2, delay.toLong()) return mGlobalActionAutomator.swipe(x1, y1, x2, y2, delay.toLong())
@@ -228,7 +213,6 @@ class SimpleActionAutomator(private val mAccessibilityBridge: AccessibilityBridg
return service.performGlobalAction(action) return service.performGlobalAction(action)
} }
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR2)
@ScriptInterface @ScriptInterface
fun paste(target: ActionTarget): Boolean { fun paste(target: ActionTarget): Boolean {
ScriptRuntime.requiresApi(18) ScriptRuntime.requiresApi(18)
@@ -244,7 +228,7 @@ class SimpleActionAutomator(private val mAccessibilityBridge: AccessibilityBridg
if (AccessibilityConfig.isUnintendedGuardEnabled() && isRunningPackageSelf) { if (AccessibilityConfig.isUnintendedGuardEnabled() && isRunningPackageSelf) {
return false return false
} }
val roots = mAccessibilityBridge.windowRoots().filter { it != null } val roots = mAccessibilityBridge.windowRoots().filterNotNull()
if (roots.isEmpty()) if (roots.isEmpty())
return false return false
var succeed = true var succeed = true
@@ -2,6 +2,7 @@ package com.stardust.autojs.core.image;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build; import android.os.Build;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import com.stardust.autojs.core.opencv.MatOfPoint; import com.stardust.autojs.core.opencv.MatOfPoint;
@@ -23,7 +24,7 @@ import org.opencv.core.Scalar;
@RequiresApi(api = Build.VERSION_CODES.KITKAT) @RequiresApi(api = Build.VERSION_CODES.KITKAT)
public class ColorFinder { public class ColorFinder {
private ScreenMetrics mScreenMetrics; private final ScreenMetrics mScreenMetrics;
public ColorFinder(ScreenMetrics screenMetrics) { public ColorFinder(ScreenMetrics screenMetrics) {
mScreenMetrics = screenMetrics; mScreenMetrics = screenMetrics;
@@ -56,7 +57,6 @@ public class ColorFinder {
} }
public Point[] findAllPointsForColor(ImageWrapper image, int color, int threshold, Rect rect) { public Point[] findAllPointsForColor(ImageWrapper image, int color, int threshold, Rect rect) {
MatOfPoint matOfPoint = findColorInner(image, color, threshold, rect); MatOfPoint matOfPoint = findColorInner(image, color, threshold, rect);
if (matOfPoint == null) { if (matOfPoint == null) {
return new Point[0]; return new Point[0];
@@ -64,9 +64,9 @@ public class ColorFinder {
Point[] points = matOfPoint.toArray(); Point[] points = matOfPoint.toArray();
OpenCVHelper.release(matOfPoint); OpenCVHelper.release(matOfPoint);
if (rect != null) { if (rect != null) {
for (int i = 0; i < points.length; i++) { for (Point point : points) {
points[i].x = mScreenMetrics.scaleX((int) (points[i].x + rect.x)); point.x = mScreenMetrics.scaleX((int) (point.x + rect.x));
points[i].y = mScreenMetrics.scaleX((int) (points[i].y + rect.y)); point.y = mScreenMetrics.scaleX((int) (point.y + rect.y));
} }
} }
return points; return points;
@@ -1,9 +1,6 @@
package com.stardust.autojs.core.ui.inflater; package com.stardust.autojs.core.ui.inflater;
import android.content.Context; import android.content.Context;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.InflateException; import android.view.InflateException;
@@ -19,6 +16,9 @@ import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import android.widget.TimePicker; import android.widget.TimePicker;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.AppBarLayout;
import com.stardust.autojs.core.ui.inflater.inflaters.AppBarInflater; import com.stardust.autojs.core.ui.inflater.inflaters.AppBarInflater;
import com.stardust.autojs.core.ui.inflater.inflaters.BaseViewInflater; import com.stardust.autojs.core.ui.inflater.inflaters.BaseViewInflater;
@@ -64,7 +64,7 @@ public class DynamicLayoutInflater {
private Map<String, ViewInflater<?>> mViewAttrSetters = new HashMap<>(); private Map<String, ViewInflater<?>> mViewAttrSetters = new HashMap<>();
private Map<String, ViewCreator<?>> mViewCreators = new HashMap<>(); private Map<String, ViewCreator<?>> mViewCreators = new HashMap<>();
private Context mContext; private Context mContext;
private ResourceParser mResourceParser; private final ResourceParser mResourceParser;
@NonNull @NonNull
private LayoutInflaterDelegate mLayoutInflaterDelegate = LayoutInflaterDelegate.NO_OP; private LayoutInflaterDelegate mLayoutInflaterDelegate = LayoutInflaterDelegate.NO_OP;
private int mInflateFlags; private int mInflateFlags;
@@ -74,7 +74,7 @@ public class DynamicLayoutInflater {
registerViewAttrSetters(); registerViewAttrSetters();
} }
@SuppressWarnings("IncompleteCopyConstructor") @SuppressWarnings("CopyConstructorMissesField")
public DynamicLayoutInflater(DynamicLayoutInflater inflater) { public DynamicLayoutInflater(DynamicLayoutInflater inflater) {
this.mResourceParser = inflater.mResourceParser; this.mResourceParser = inflater.mResourceParser;
this.mContext = inflater.mContext; this.mContext = inflater.mContext;
@@ -291,7 +291,7 @@ public class DynamicLayoutInflater {
} }
Class<?> clazz = Class.forName(name); Class<?> clazz = Class.forName(name);
String style = attrs.get("style"); String style = attrs.get("style");
if (style == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { if (style == null) {
return (View) clazz.getConstructor(Context.class).newInstance(mContext); return (View) clazz.getConstructor(Context.class).newInstance(mContext);
} else { } else {
int styleRes = Res.parseStyle(mContext, style); int styleRes = Res.parseStyle(mContext, style);
@@ -316,7 +316,6 @@ public class DynamicLayoutInflater {
return attributes; return attributes;
} }
@SuppressWarnings("unchecked")
protected void applyAttributes(InflateContext context, View view, ViewInflater<View> setter, Map<String, String> attrs, @Nullable ViewGroup parent) { protected void applyAttributes(InflateContext context, View view, ViewInflater<View> setter, Map<String, String> attrs, @Nullable ViewGroup parent) {
if (setter != null) { if (setter != null) {
for (Map.Entry<String, String> entry : attrs.entrySet()) { for (Map.Entry<String, String> entry : attrs.entrySet()) {
@@ -1,18 +1,15 @@
package com.stardust.autojs.core.ui.widget; package com.stardust.autojs.core.ui.widget;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.appcompat.widget.AppCompatTextView; import androidx.appcompat.widget.AppCompatTextView;
import android.util.AttributeSet;
/** /**
* Created by Stardust on 2017/5/15. * Created by Stardust on 2017/5/15.
*/ */
@SuppressLint("AppCompatCustomView")
public class JsTextView extends AppCompatTextView { public class JsTextView extends AppCompatTextView {
public JsTextView(Context context) { public JsTextView(Context context) {
@@ -0,0 +1,30 @@
package com.stardust.autojs.core.ui.widget;
import android.content.Context;
import android.util.AttributeSet;
import androidx.annotation.Nullable;
import androidx.appcompatlegacy.widget.AppCompatTextView;
public class JsTextViewLegacy extends AppCompatTextView {
public JsTextViewLegacy(Context context) {
super(context);
}
public JsTextViewLegacy(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
}
public JsTextViewLegacy(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
}
public String text() {
return getText().toString();
}
public void text(CharSequence text) {
setText(text);
}
}
@@ -1,9 +1,6 @@
package com.stardust.autojs.core.ui.xml; package com.stardust.autojs.core.ui.xml;
import androidx.appcompat.widget.Toolbar; import android.os.Build;
import androidx.cardview.widget.CardView;
import androidx.drawerlayout.widget.DrawerLayout;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.DatePicker; import android.widget.DatePicker;
import android.widget.ProgressBar; import android.widget.ProgressBar;
@@ -13,6 +10,9 @@ import android.widget.ScrollView;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TimePicker; import android.widget.TimePicker;
import androidx.cardview.widget.CardView;
import androidx.drawerlayout.widget.DrawerLayout;
import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.stardust.autojs.core.graphics.ScriptCanvasView; import com.stardust.autojs.core.graphics.ScriptCanvasView;
@@ -27,6 +27,7 @@ import com.stardust.autojs.core.ui.widget.JsRelativeLayout;
import com.stardust.autojs.core.ui.widget.JsSpinner; import com.stardust.autojs.core.ui.widget.JsSpinner;
import com.stardust.autojs.core.ui.widget.JsTabLayout; import com.stardust.autojs.core.ui.widget.JsTabLayout;
import com.stardust.autojs.core.ui.widget.JsTextView; import com.stardust.autojs.core.ui.widget.JsTextView;
import com.stardust.autojs.core.ui.widget.JsTextViewLegacy;
import com.stardust.autojs.core.ui.widget.JsToolbar; import com.stardust.autojs.core.ui.widget.JsToolbar;
import com.stardust.autojs.core.ui.widget.JsViewPager; import com.stardust.autojs.core.ui.widget.JsViewPager;
import com.stardust.autojs.core.ui.widget.JsWebView; import com.stardust.autojs.core.ui.widget.JsWebView;
@@ -59,7 +60,9 @@ public class XmlConverter {
.map("horizontal", JsLinearLayout.class.getName()) .map("horizontal", JsLinearLayout.class.getName())
.map("relative", JsRelativeLayout.class.getName()) .map("relative", JsRelativeLayout.class.getName())
.map("button", JsButton.class.getName()) .map("button", JsButton.class.getName())
.map("text", JsTextView.class.getName()) .map("text", Build.VERSION.SDK_INT < Build.VERSION_CODES.O
? JsTextViewLegacy.class.getName()
: JsTextView.class.getName())
.map("input", JsEditText.class.getName()) .map("input", JsEditText.class.getName())
.map("img", JsImageView.class.getName()) .map("img", JsImageView.class.getName())
.map("datepicker", DatePicker.class.getName()) .map("datepicker", DatePicker.class.getName())
@@ -332,9 +332,6 @@ public class ScriptRuntime {
} }
public void requestPermissions(String[] permissions) { public void requestPermissions(String[] permissions) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
return;
}
Context context = uiHandler.getContext(); Context context = uiHandler.getContext();
permissions = Permissions.getPermissionsNeedToRequest(context, permissions); permissions = Permissions.getPermissionsNeedToRequest(context, permissions);
if (permissions.length == 0) if (permissions.length == 0)
@@ -412,9 +409,7 @@ public class ScriptRuntime {
mRootShell = null; mRootShell = null;
mShellSupplier = null; mShellSupplier = null;
}); });
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
ignoresException(images::releaseScreenCapturer); ignoresException(images::releaseScreenCapturer);
}
ignoresException(sensors::unregisterAll); ignoresException(sensors::unregisterAll);
ignoresException(timers::recycle); ignoresException(timers::recycle);
ignoresException(ui::recycle); ignoresException(ui::recycle);
@@ -456,8 +451,7 @@ public class ScriptRuntime {
public static String getStackTrace(Throwable e, boolean printJavaStackTrace) { public static String getStackTrace(Throwable e, boolean printJavaStackTrace) {
String message = e.getMessage(); String message = e.getMessage();
StringBuilder scriptTrace = new StringBuilder(message == null ? "" : message + "\n"); StringBuilder scriptTrace = new StringBuilder(message == null ? "" : message + "\n");
if (e instanceof RhinoException) { if (e instanceof RhinoException rhinoException) {
RhinoException rhinoException = (RhinoException) e;
scriptTrace.append(rhinoException.details()).append("\n"); scriptTrace.append(rhinoException.details()).append("\n");
for (ScriptStackElement element : rhinoException.getScriptStack()) { for (ScriptStackElement element : rhinoException.getScriptStack()) {
element.renderV8Style(scriptTrace); element.renderV8Style(scriptTrace);
+10 -10
View File
@@ -1,5 +1,5 @@
apply plugin: "com.android.library" apply plugin: 'com.android.library'
apply plugin: "kotlin-android" apply plugin: 'kotlin-android'
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions { kotlinOptions {
@@ -8,13 +8,13 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
} }
android { android {
compileSdkVersion versions.compile compileSdkVersion versions.project.compile
defaultConfig { defaultConfig {
minSdkVersion versions.mini minSdkVersion versions.project.mini
targetSdkVersion versions.target targetSdkVersion versions.project.target
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }
compileOptions { compileOptions {
@@ -27,7 +27,7 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
} }
@@ -37,7 +37,7 @@ repositories {
} }
dependencies { dependencies {
testImplementation "junit:junit:${junitVer}" testImplementation "junit:junit:${versions.junit}"
implementation "androidx.appcompat:appcompat:1.4.0"
api project(":common") api project(':common')
} }
+29 -23
View File
@@ -4,39 +4,47 @@ import org.apache.groovy.json.internal.LazyMap
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlinVer = "1.6.10" ext.versions = [
ext.junitVer = "4.13.2" 'junit' : '4.13.2',
'glide' : '4.12.0',
'kotlin' : '1.6.10',
'leakcanary' : '2.8.1',
'annotations' : '4.8.0',
'butterKnife' : '10.2.3',
// TODO upgrade to 3.x (more difficult than expected)
'materialDialogs': '0.9.6.0',
]
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
maven { url "https://maven.aliyun.com/repository/central" } maven { url 'https://maven.aliyun.com/repository/central' }
maven { url "https://maven.aliyun.com/repository/google" } maven { url 'https://maven.aliyun.com/repository/google' }
maven { url "https://maven.aliyun.com/repository/gradle-plugin" } maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
maven { url "https://maven.aliyun.com/repository/jcenter" } maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url "https://maven.aliyun.com/repository/public" } maven { url 'https://maven.aliyun.com/repository/public' }
maven { url "https://repo.huaweicloud.com/repository/maven" } maven { url 'https://repo.huaweicloud.com/repository/maven' }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:7.2.0-alpha06" classpath 'com.android.tools.build:gradle:7.2.0-beta01'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVer}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "com.jakewharton:butterknife-gradle-plugin:10.2.1" classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.1'
classpath "org.codehaus.groovy:groovy-json:3.0.8" classpath 'org.codehaus.groovy:groovy-json:3.0.8'
} }
} }
allprojects { allprojects {
repositories { repositories {
maven { url "https://jitpack.io" } maven { url 'https://jitpack.io' }
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
mavenCentral() mavenCentral()
maven { url "https://maven.aliyun.com/repository/central" } maven { url 'https://maven.aliyun.com/repository/central' }
maven { url "https://maven.aliyun.com/repository/google" } maven { url 'https://maven.aliyun.com/repository/google' }
maven { url "https://maven.aliyun.com/repository/gradle-plugin" } maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
maven { url "https://maven.aliyun.com/repository/jcenter" } maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url "https://maven.aliyun.com/repository/public" } maven { url 'https://maven.aliyun.com/repository/public' }
maven { url "https://repo.huaweicloud.com/repository/maven" } maven { url 'https://repo.huaweicloud.com/repository/maven' }
google() google()
} }
} }
@@ -45,6 +53,4 @@ task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
ext { ext.versions.project = new JsonSlurper().parse(file("./project-versions.json")) as LazyMap
versions = new JsonSlurper().parse(file("./project-versions.json")) as LazyMap
}
+37 -19
View File
@@ -1,8 +1,8 @@
apply plugin: "com.android.library" apply plugin: 'com.android.library'
apply plugin: "kotlin-android" apply plugin: 'kotlin-android'
// tasks.withType(JavaCompile) { // tasks.withType(JavaCompile) {
// options.compilerArgs << "-Xlint:deprecation" // options.compilerArgs << '-Xlint:deprecation'
// } // }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
@@ -12,19 +12,19 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
} }
android { android {
compileSdkVersion versions.compile compileSdkVersion versions.project.compile
defaultConfig { defaultConfig {
minSdkVersion versions.mini minSdkVersion versions.project.mini
targetSdkVersion versions.target targetSdkVersion versions.project.target
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
lintOptions { lintOptions {
@@ -37,33 +37,51 @@ android {
} }
dependencies { dependencies {
testImplementation "junit:junit:${junitVer}" testImplementation "junit:junit:${versions.junit}"
// Kotlin // Kotlin
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVer}" // noinspection DifferentStdlibGradleVersion
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
// Android supports
api 'com.google.android.material:material:1.6.0-alpha02'
// Material Dialogs
api "com.afollestad.material-dialogs:core:${versions.materialDialogs}"
api "com.afollestad.material-dialogs:commons:${versions.materialDialogs}"
// Glide
api "com.github.bumptech.glide:glide:${versions.glide}"
// RoundedImageView // RoundedImageView
api "com.makeramen:roundedimageview:2.3.0" api 'com.makeramen:roundedimageview:2.3.0'
// EventBus // EventBus
api "org.greenrobot:eventbus:3.3.1" api 'org.greenrobot:eventbus:3.3.1'
// Annotation // Annotation
api "androidx.annotation:annotation:1.3.0" api 'androidx.annotation:annotation:1.3.0'
// Preference // Preference
api "androidx.preference:preference-ktx:1.1.1" api 'androidx.preference:preference-ktx:1.2.0'
// RootShell // RootShell
api "com.github.Stericson:RootShell:1.6" api 'com.github.Stericson:RootShell:1.6'
// JDeferred // JDeferred
api "org.jdeferred:jdeferred-android-aar:1.2.6" api 'org.jdeferred:jdeferred-android-aar:1.2.6'
// Auto.js // Auto.js
api "com.github.hyb1996:settingscompat:1.1.5" api 'com.github.hyb1996:settingscompat:1.1.5'
api "com.github.hyb1996:EnhancedFloaty:0.31" api 'com.github.hyb1996:EnhancedFloaty:0.31'
// AppCompat
api 'androidx.appcompat:appcompat:1.4.1'
api project(':libs:androidx.appcompat-1.0.2')
// OpenCV
api project(':libs:org.opencv-4.5.4')
// Rhino // Rhino
api project(":libs:org.mozilla.rhino-1.7.14") api project(':libs:org.mozilla.rhino-1.7.14')
} }
@@ -10,15 +10,14 @@ public class SdkVersionUtil {
"1.0", "1.1", "1.5", "1.6", "2.0", "2.0.1", "2.1.x", "2.2.x", "1.0", "1.1", "1.5", "1.6", "2.0", "2.0.1", "2.1.x", "2.2.x",
"2.3", "2.3.3", "3.0.x", "3.1.x", "3.2", "4.0", "4.0.3", "4.1", "2.3", "2.3.3", "3.0.x", "3.1.x", "3.2", "4.0", "4.0.3", "4.1",
"4.2", "4.3", "4.4.2", "4.4W", "5.0", "5.1", "6.0", "7.0", "7.1", "4.2", "4.3", "4.4.2", "4.4W", "5.0", "5.1", "6.0", "7.0", "7.1",
"8.0" "8.0", "8.1", "9", "10", "11", "12"
}; };
public static String sdkIntToString(int i) { public static String sdkIntToString(int i) {
if (i > 26) { if (i > 31) {
return "Unknown"; return "Unknown";
} }
return SDK_VERSIONS[i - 1]; return SDK_VERSIONS[i - 1];
} }
} }
+2 -2
View File
@@ -1,6 +1,6 @@
#Thu Dec 30 20:07:37 CST 2021 #Sat Feb 05 15:16:06 CST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
+32 -37
View File
@@ -1,22 +1,22 @@
apply plugin: "com.android.application" apply plugin: 'com.android.application'
apply plugin: "kotlin-android" apply plugin: 'kotlin-android'
android { android {
compileSdkVersion versions.compile compileSdkVersion versions.project.compile
defaultConfig { defaultConfig {
applicationId "com.stardust.auojs.inrt" applicationId 'com.stardust.auojs.inrt'
minSdkVersion versions.mini minSdkVersion versions.project.mini
targetSdkVersion versions.target targetSdkVersion versions.project.target
versionCode versions.appVersionCode versionCode versions.project.appVersionCode
versionName versions.appVersionName versionName versions.project.appVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
multiDexEnabled true multiDexEnabled true
} }
lintOptions { lintOptions {
abortOnError false abortOnError false
disable "MissingTranslation" disable 'MissingTranslation'
disable "ExtraTranslation" disable 'ExtraTranslation'
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_16 sourceCompatibility JavaVersion.VERSION_16
@@ -37,7 +37,7 @@ android {
reset() reset()
// Specifies a list of ABIs that Gradle should create APKs for. // Specifies a list of ABIs that Gradle should create APKs for.
include "armeabi-v7a" include 'x86', 'armeabi-v7a'
// Specifies that we do not want to also generate a universal APK that includes all ABIs. // Specifies that we do not want to also generate a universal APK that includes all ABIs.
universalApk false universalApk false
@@ -46,51 +46,51 @@ android {
buildTypes { buildTypes {
debug { debug {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
} }
def buildApkPluginForAbi(File pluginProjectDir, String abi) { def buildApkPluginForAbi(File pluginProjectDir, String abi) {
copy { copy {
from file("..\\app\\release\\") from file('..\\app\\release\\')
into new File(pluginProjectDir, "app\\src\\main\\assets") into new File(pluginProjectDir, 'app\\src\\main\\assets')
def fileName = "inrt-" + abi + "-release.apk" def fileName = 'inrt-' + abi + '-release.apk'
include fileName include fileName
rename fileName, "template.apk" rename fileName, 'template.apk'
} }
exec { exec {
workingDir pluginProjectDir workingDir pluginProjectDir
commandLine "gradlew.bat", "assembleRelease" commandLine 'gradlew.bat', 'assembleRelease'
} }
copy { copy {
from new File(pluginProjectDir, "app\\build\\outputs\\apk\\release") from new File(pluginProjectDir, 'app\\build\\outputs\\apk\\release')
into file("..\\common\\release") into file('..\\common\\release')
def fileName = "打包插件-" + versions.appVersionName + "-release.apk" def fileName = '打包插件-' + versions.project.appVersionName + '-release.apk'
include fileName include fileName
rename fileName, "打包插件-" + abi + "-" + versions.appVersionName + "-release.apk" rename fileName, '打包插件-' + abi + '-' + versions.project.appVersionName + '-release.apk'
} }
} }
task buildApkPlugin { task buildApkPlugin {
doLast { doLast {
def pluginProjectDirPath = "..\\..\\AutoJsApkBuilderPlugin" def pluginProjectDirPath = '..\\..\\AutoJsApkBuilderPlugin'
def pluginProjectDir = file(pluginProjectDirPath) def pluginProjectDir = file(pluginProjectDirPath)
if (!pluginProjectDir.exists() || !pluginProjectDir.isDirectory()) { if (!pluginProjectDir.exists() || !pluginProjectDir.isDirectory()) {
println "pluginProjectDir not exists" println 'pluginProjectDir not exists'
return return
} }
buildApkPluginForAbi(pluginProjectDir, "armeabi-v7a") buildApkPluginForAbi(pluginProjectDir, 'armeabi-v7a')
} }
} }
tasks.whenTaskAdded { task -> tasks.whenTaskAdded { task ->
if (task.name == "assembleRelease") { if (task.name == 'assembleRelease') {
task.finalizedBy "buildApkPlugin" task.finalizedBy 'buildApkPlugin'
} }
} }
@@ -105,14 +105,9 @@ repositories {
} }
dependencies { dependencies {
testImplementation "junit:junit:${junitVer}" testImplementation "junit:junit:${versions.junit}"
implementation "com.github.bumptech.glide:glide:4.12.0" implementation project(':automator')
implementation project(':common')
implementation project(":libs:org.mozilla.rhino-1.7.14") implementation project(':autojs')
implementation project(":libs:org.opencv-4.5.4")
implementation project(":automator")
implementation project(":common")
implementation project(":autojs")
} }
Binary file not shown.
@@ -0,0 +1,2 @@
configurations.maybeCreate('default')
artifacts.add('default', file('appcompatlegacy.aar'))
+2 -2
View File
@@ -1,2 +1,2 @@
configurations.maybeCreate("default") configurations.maybeCreate('default')
artifacts.add("default", file("dx.jar")) artifacts.add('default', file('dx.jar'))
@@ -1,2 +1,2 @@
configurations.maybeCreate("default") configurations.maybeCreate('default')
artifacts.add("default", file("crashreport-2.6.6.aar")) artifacts.add('default', file('crashreport-2.6.6.aar'))
+2 -2
View File
@@ -1,2 +1,2 @@
configurations.maybeCreate("default") configurations.maybeCreate('default')
artifacts.add("default", file("term-debug.aar")) artifacts.add('default', file('term-debug.aar'))
@@ -1,2 +1,2 @@
configurations.maybeCreate("default") configurations.maybeCreate('default')
artifacts.add("default", file("emulatorview-release.aar")) artifacts.add('default', file('emulatorview-release.aar'))
@@ -1,2 +1,2 @@
configurations.maybeCreate("default") configurations.maybeCreate('default')
artifacts.add("default", file("libtermexec-release.aar")) artifacts.add('default', file('libtermexec-release.aar'))
+2 -2
View File
@@ -4,5 +4,5 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
} }
} }
configurations.maybeCreate("default") configurations.maybeCreate('default')
artifacts.add("default", file("rhino-1.7.14.jar")) artifacts.add('default', file('rhino-1.7.14.jar'))
+2 -2
View File
@@ -1,2 +1,2 @@
configurations.maybeCreate("default") configurations.maybeCreate('default')
artifacts.add("default", file("opencv-4.5.4.aar")) artifacts.add('default', file('opencv-4.5.4.aar'))
+3 -3
View File
@@ -1,7 +1,7 @@
{ {
"appVersionCode": 694, "appVersionCode": 718,
"appVersionName": "6.0.1", "appVersionName": "6.0.2",
"appSinceDate": "Jan 1, 2022", "appSinceDate": "Feb 5, 2022",
"target": 28, "target": 28,
"mini": 24, "mini": 24,
"compile": 31 "compile": 31
+8 -7
View File
@@ -1,9 +1,10 @@
include ':app', ':automator', ':common', ':autojs', ':inrt' include ':app', ':automator', ':common', ':autojs', ':inrt'
include ":libs:com.android.dx-1.7.0" include ':libs:com.android.dx-1.7.0'
include ":libs:com.tencent.bugly.crashreport-2.6.6" include ':libs:com.tencent.bugly.crashreport-2.6.6'
include ":libs:jackpal.androidterm.emulatorview-1.0.42" include ':libs:jackpal.androidterm.emulatorview-1.0.42'
include ":libs:jackpal.androidterm.libtermexec-1.0" include ':libs:jackpal.androidterm.libtermexec-1.0'
include ":libs:jackpal.androidterm-1.0.70" include ':libs:jackpal.androidterm-1.0.70'
include ":libs:org.mozilla.rhino-1.7.14" include ':libs:org.mozilla.rhino-1.7.14'
include ":libs:org.opencv-4.5.4" include ':libs:org.opencv-4.5.4'
include ':libs:androidx.appcompat-1.0.2'