diff --git a/autojs-aar/rhino-jdk7/build.gradle b/autojs-aar/rhino-jdk7/build.gradle new file mode 100644 index 00000000..d312a079 --- /dev/null +++ b/autojs-aar/rhino-jdk7/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'com.android.library' +} + +android { + compileSdk versions.compile + + defaultConfig { + minSdk versions.mini + targetSdk versions.target + versionCode 1 + versionName "1.0" + } + + buildTypes { + release { + minifyEnabled false + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } +} + +dependencies { + api files('libs/rhino-1.7.14-jdk7.jar') +} \ No newline at end of file diff --git a/autojs-aar/rhino-jdk7/libs/rhino-1.7.14-jdk7-sources.jar b/autojs-aar/rhino-jdk7/libs/rhino-1.7.14-jdk7-sources.jar new file mode 100644 index 00000000..b36d5393 Binary files /dev/null and b/autojs-aar/rhino-jdk7/libs/rhino-1.7.14-jdk7-sources.jar differ diff --git a/autojs-aar/rhino-jdk7/libs/rhino-1.7.14-jdk7.jar b/autojs-aar/rhino-jdk7/libs/rhino-1.7.14-jdk7.jar new file mode 100644 index 00000000..e2ddd7a7 Binary files /dev/null and b/autojs-aar/rhino-jdk7/libs/rhino-1.7.14-jdk7.jar differ diff --git a/autojs-aar/rhino-jdk7/src/main/AndroidManifest.xml b/autojs-aar/rhino-jdk7/src/main/AndroidManifest.xml new file mode 100644 index 00000000..d18cfd2a --- /dev/null +++ b/autojs-aar/rhino-jdk7/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/autojs/build.gradle b/autojs/build.gradle index de0dc79b..0a042000 100644 --- a/autojs/build.gradle +++ b/autojs/build.gradle @@ -46,7 +46,8 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) testImplementation "junit:junit:$junit_version" - api fileTree(include: ['*.jar'], dir: 'libs') +// api fileTree(include: ['*.jar'], dir: 'libs') + api fileTree('libs/dx.jar') api 'org.greenrobot:eventbus:3.3.1' api 'net.lingala.zip4j:zip4j:1.3.2' api('com.afollestad.material-dialogs:core:0.9.2.3', { @@ -57,7 +58,7 @@ dependencies { // OpenCv api project(path: ':autojs-aar:opencv') // OkHttp - api 'com.squareup.okhttp3:okhttp:3.10.0' + api 'com.squareup.okhttp3:okhttp:3.14.9' // JDeferred api 'org.jdeferred:jdeferred-android-aar:1.2.6' //RootShell @@ -72,7 +73,7 @@ dependencies { api project(path: ':autojs-aar:libtermexec') api project(path: ':autojs-aar:emulatorview') api project(path: ':autojs-aar:term') - api files('libs/rhino-1.7.11.jar') + api project(path: ':autojs-aar:rhino-jdk7') api project(path: ':common') api project(path: ':automator') implementation 'com.rmtheis:tess-two:9.1.0' diff --git a/autojs/libs/rhino-1.7.11.jar b/autojs/libs/rhino-1.7.11.jar deleted file mode 100644 index 50b4d5a4..00000000 Binary files a/autojs/libs/rhino-1.7.11.jar and /dev/null differ diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextViewOld.java b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextViewOld.java new file mode 100644 index 00000000..45c758ab --- /dev/null +++ b/autojs/src/main/java/com/stardust/autojs/core/ui/widget/JsTextViewOld.java @@ -0,0 +1,39 @@ +package com.stardust.autojs.core.ui.widget; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.util.AttributeSet; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +/** + * Android O (API26) 以下的无法使用AppCompatTextView 采用TextView + * + * Created by TonyJiangWJ on 2022/01/18. + * + */ +@SuppressLint("AppCompatCustomView") +public class JsTextViewOld extends TextView { + + public JsTextViewOld(Context context) { + super(context); + } + + public JsTextViewOld(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + public JsTextViewOld(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public String text() { + return getText().toString(); + } + + public void text(CharSequence text) { + setText(text); + } + +} diff --git a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java b/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java index 1b6e203e..8ab5cda3 100644 --- a/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java +++ b/autojs/src/main/java/com/stardust/autojs/core/ui/xml/XmlConverter.java @@ -1,5 +1,6 @@ package com.stardust.autojs.core.ui.xml; +import android.os.Build; import android.widget.CheckBox; import android.widget.DatePicker; import android.widget.ProgressBar; @@ -23,6 +24,7 @@ import com.stardust.autojs.core.ui.widget.JsRelativeLayout; import com.stardust.autojs.core.ui.widget.JsSpinner; import com.stardust.autojs.core.ui.widget.JsTabLayout; import com.stardust.autojs.core.ui.widget.JsTextView; +import com.stardust.autojs.core.ui.widget.JsTextViewOld; import com.stardust.autojs.core.ui.widget.JsToolbar; import com.stardust.autojs.core.ui.widget.JsViewPager; import com.stardust.autojs.core.ui.widget.JsWebView; @@ -58,7 +60,7 @@ public class XmlConverter { .map("horizontal", JsLinearLayout.class.getName()) .map("relative", JsRelativeLayout.class.getName()) .map("button", JsButton.class.getName()) - .map("text", JsTextView.class.getName()) + .map("text", Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? JsTextView.class.getName() : JsTextViewOld.class.getName()) .map("input", JsEditText.class.getName()) .map("img", JsImageView.class.getName()) .map("datepicker", DatePicker.class.getName()) diff --git a/automator/build.gradle b/automator/build.gradle index 81cfdc73..dd457b6c 100644 --- a/automator/build.gradle +++ b/automator/build.gradle @@ -40,6 +40,7 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) testImplementation "junit:junit:$junit_version" - api 'androidx.appcompat:appcompat:1.2.0' + api "androidx.appcompat:appcompat:$appcompat_version" + implementation("androidx.appcompat:appcompat-resources:$appcompat_version") api project(path: ':common') } diff --git a/build.gradle b/build.gradle index bf70fe05..d2a00905 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,6 @@ import groovy.json.JsonSlurper buildscript { ext.kotlin_version = '1.6.10' - ext.junit_version = '4.13.2' repositories { mavenCentral() google() @@ -42,4 +41,6 @@ task clean(type: Delete) { ext { versions = new JsonSlurper().parse(file('./project-versions.json')) + ext.junit_version = '4.13.2' + ext.appcompat_version = '1.4.1' } diff --git a/settings.gradle b/settings.gradle index 35293ca9..8b9f36f8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,3 +9,4 @@ include ':js-supports:autojs-tool-webview' include ':js-supports:autojs-tool-encrypt' include ':js-supports:autojs-tool-common' include ':js-supports:kill-pro-limit' +include ':autojs-aar:rhino-jdk7'