diff --git a/autojs-aar/emulatorview/build.gradle b/autojs-aar/emulatorview/build.gradle new file mode 100644 index 00000000..ee7c2875 --- /dev/null +++ b/autojs-aar/emulatorview/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('emulatorview-release.aar')) \ No newline at end of file diff --git a/autojs-aar/emulatorview/emulatorview-release.aar b/autojs-aar/emulatorview/emulatorview-release.aar new file mode 100644 index 00000000..84e3e334 Binary files /dev/null and b/autojs-aar/emulatorview/emulatorview-release.aar differ diff --git a/autojs-aar/libtermexec/build.gradle b/autojs-aar/libtermexec/build.gradle new file mode 100644 index 00000000..8a719212 --- /dev/null +++ b/autojs-aar/libtermexec/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('libtermexec-release.aar')) \ No newline at end of file diff --git a/autojs-aar/libtermexec/libtermexec-release.aar b/autojs-aar/libtermexec/libtermexec-release.aar new file mode 100644 index 00000000..f49ae349 Binary files /dev/null and b/autojs-aar/libtermexec/libtermexec-release.aar differ diff --git a/autojs-aar/opencv/build.gradle b/autojs-aar/opencv/build.gradle new file mode 100644 index 00000000..fb472df0 --- /dev/null +++ b/autojs-aar/opencv/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('opencv-4.5.5.aar')) \ No newline at end of file diff --git a/autojs-aar/opencv/opencv-4.5.5.aar b/autojs-aar/opencv/opencv-4.5.5.aar new file mode 100644 index 00000000..269b419f Binary files /dev/null and b/autojs-aar/opencv/opencv-4.5.5.aar differ diff --git a/autojs-aar/term/build.gradle b/autojs-aar/term/build.gradle new file mode 100644 index 00000000..4a60d012 --- /dev/null +++ b/autojs-aar/term/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('term-debug.aar')) \ No newline at end of file diff --git a/autojs-aar/term/term-debug.aar b/autojs-aar/term/term-debug.aar new file mode 100644 index 00000000..b32ad432 Binary files /dev/null and b/autojs-aar/term/term-debug.aar differ diff --git a/autojs-tool-color-center/.gitignore b/autojs-tool-color-center/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/autojs-tool-color-center/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/autojs-tool-color-center/consumer-rules.pro b/autojs-tool-color-center/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/autojs-tool-color-center/proguard-rules.pro b/autojs-tool-color-center/proguard-rules.pro deleted file mode 100644 index f1b42451..00000000 --- a/autojs-tool-color-center/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/autojs-tool-common/.gitignore b/autojs-tool-common/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/autojs-tool-common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/autojs-tool-download/.gitignore b/autojs-tool-download/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/autojs-tool-download/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/autojs-tool-download/consumer-rules.pro b/autojs-tool-download/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/autojs-tool-download/proguard-rules.pro b/autojs-tool-download/proguard-rules.pro deleted file mode 100644 index f1b42451..00000000 --- a/autojs-tool-download/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/autojs-tool-encrypt/.gitignore b/autojs-tool-encrypt/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/autojs-tool-encrypt/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/autojs-tool-webview/.gitignore b/autojs-tool-webview/.gitignore deleted file mode 100644 index 796b96d1..00000000 --- a/autojs-tool-webview/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/js-supports/.gitignore b/js-supports/.gitignore new file mode 100644 index 00000000..d1638636 --- /dev/null +++ b/js-supports/.gitignore @@ -0,0 +1 @@ +build/ \ No newline at end of file diff --git a/autojs-tool-color-center/build.gradle b/js-supports/autojs-tool-color-center/build.gradle similarity index 77% rename from autojs-tool-color-center/build.gradle rename to js-supports/autojs-tool-color-center/build.gradle index 654ebde0..fe605639 100644 --- a/autojs-tool-color-center/build.gradle +++ b/js-supports/autojs-tool-color-center/build.gradle @@ -9,14 +9,11 @@ android { targetSdkVersion versions.target versionCode 1 versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -33,7 +30,8 @@ task makeColorCenterJar(type: Copy) { // 删除存在的 delete 'build/libs/color-center-sdk.jar' // 设置拷贝的文件 - from('build/intermediates/packaged-classes/release/') +// from('build/intermediates/packaged-classes/release/') + from('build/intermediates/aar_main_jar/release/') // 打进jar包后的文件目录 into('build/libs/') // 将classes.jar放入build/libs/目录下 @@ -47,7 +45,7 @@ task makeColorCenterJar(type: Copy) { makeColorCenterJar.dependsOn(build) dependencies { - api project(path: ':autojs') - testImplementation 'junit:junit:4.12' + implementation project(path: ':autojs') + testImplementation "junit:junit:$junit_version" implementation 'com.rmtheis:tess-two:9.1.0' } diff --git a/autojs-tool-color-center/src/main/AndroidManifest.xml b/js-supports/autojs-tool-color-center/src/main/AndroidManifest.xml similarity index 100% rename from autojs-tool-color-center/src/main/AndroidManifest.xml rename to js-supports/autojs-tool-color-center/src/main/AndroidManifest.xml diff --git a/autojs-tool-color-center/src/main/java/com/tony/BitCheck.java b/js-supports/autojs-tool-color-center/src/main/java/com/tony/BitCheck.java similarity index 100% rename from autojs-tool-color-center/src/main/java/com/tony/BitCheck.java rename to js-supports/autojs-tool-color-center/src/main/java/com/tony/BitCheck.java diff --git a/autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculator.java b/js-supports/autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculator.java similarity index 100% rename from autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculator.java rename to js-supports/autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculator.java diff --git a/autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculatorWithInterval.java b/js-supports/autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculatorWithInterval.java similarity index 100% rename from autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculatorWithInterval.java rename to js-supports/autojs-tool-color-center/src/main/java/com/tony/ColorCenterCalculatorWithInterval.java diff --git a/autojs-tool-color-center/src/main/java/com/tony/IntBitCheck.java b/js-supports/autojs-tool-color-center/src/main/java/com/tony/IntBitCheck.java similarity index 100% rename from autojs-tool-color-center/src/main/java/com/tony/IntBitCheck.java rename to js-supports/autojs-tool-color-center/src/main/java/com/tony/IntBitCheck.java diff --git a/autojs-tool-color-center/src/main/java/com/tony/Point.java b/js-supports/autojs-tool-color-center/src/main/java/com/tony/Point.java similarity index 100% rename from autojs-tool-color-center/src/main/java/com/tony/Point.java rename to js-supports/autojs-tool-color-center/src/main/java/com/tony/Point.java diff --git a/autojs-tool-color-center/src/main/java/com/tony/ScriptLogger.java b/js-supports/autojs-tool-color-center/src/main/java/com/tony/ScriptLogger.java similarity index 100% rename from autojs-tool-color-center/src/main/java/com/tony/ScriptLogger.java rename to js-supports/autojs-tool-color-center/src/main/java/com/tony/ScriptLogger.java diff --git a/autojs-tool-common/build.gradle b/js-supports/autojs-tool-common/build.gradle similarity index 80% rename from autojs-tool-common/build.gradle rename to js-supports/autojs-tool-common/build.gradle index 154f1542..7cbe3c7f 100644 --- a/autojs-tool-common/build.gradle +++ b/js-supports/autojs-tool-common/build.gradle @@ -27,7 +27,8 @@ task makeAutojsCommonJar(type: Copy) { // 删除存在的 delete 'build/libs/autojs-common-sdk.jar' // 设置拷贝的文件 - from('build/intermediates/packaged-classes/release/') +// from('build/intermediates/packaged-classes/release/') + from('build/intermediates/aar_main_jar/release/') // 打进jar包后的文件目录 into('build/libs/') // 将classes.jar放入build/libs/目录下 @@ -41,8 +42,5 @@ task makeAutojsCommonJar(type: Copy) { makeAutojsCommonJar.dependsOn(build) dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - api project(path: ':autojs') -// implementation project(path: ':autojs') + implementation project(path: ':autojs') } \ No newline at end of file diff --git a/autojs-tool-common/src/main/AndroidManifest.xml b/js-supports/autojs-tool-common/src/main/AndroidManifest.xml similarity index 100% rename from autojs-tool-common/src/main/AndroidManifest.xml rename to js-supports/autojs-tool-common/src/main/AndroidManifest.xml diff --git a/autojs-tool-common/src/main/java/com/tony/autojs/common/ImagesResolver.java b/js-supports/autojs-tool-common/src/main/java/com/tony/autojs/common/ImagesResolver.java similarity index 100% rename from autojs-tool-common/src/main/java/com/tony/autojs/common/ImagesResolver.java rename to js-supports/autojs-tool-common/src/main/java/com/tony/autojs/common/ImagesResolver.java diff --git a/autojs-tool-common/src/main/java/com/tony/autojs/common/ProcessMappedShare.java b/js-supports/autojs-tool-common/src/main/java/com/tony/autojs/common/ProcessMappedShare.java similarity index 85% rename from autojs-tool-common/src/main/java/com/tony/autojs/common/ProcessMappedShare.java rename to js-supports/autojs-tool-common/src/main/java/com/tony/autojs/common/ProcessMappedShare.java index 848665d7..f073f952 100644 --- a/autojs-tool-common/src/main/java/com/tony/autojs/common/ProcessMappedShare.java +++ b/js-supports/autojs-tool-common/src/main/java/com/tony/autojs/common/ProcessMappedShare.java @@ -14,6 +14,7 @@ import java.lang.reflect.Method; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.nio.charset.StandardCharsets; +import java.util.concurrent.TimeUnit; /** * 基于文件的单向通信 @@ -211,7 +212,7 @@ public class ProcessMappedShare { * @param data * @throws IOException */ - public void postInfo(String data) throws IOException { + public void postInfo(String data) throws Exception { if (isSubscriber) { throw new IllegalStateException("当前是订阅模式，无法发送消息"); } @@ -219,24 +220,43 @@ public class ProcessMappedShare { throw new IllegalArgumentException("不能发送空内容"); } FileChannel fc = randomAccessFile.getChannel(); - MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_WRITE, 0, bufferSize); + final MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_WRITE, 0, bufferSize); - byte[] bytes = data.getBytes(); + final byte[] bytes = data.getBytes(); int length = bytes.length; if (length > bufferSize) { throw new IllegalArgumentException(String.format("发送字节大小[%d]大于缓冲区最大大小[%d]", length, bufferSize)); } - byte marker = mbb.get(0); - if (marker == 1) { - throw new IllegalStateException("文件正在被写入，无法发送消息"); - } - mbb.put(0, (byte) 1); - int index = 1; - for (byte b : bytes) { - mbb.put(index++, b); - } - // 标记可读取 - mbb.put(0, (byte) 2); + + start(new Runnable() { + @Override + public void run() { + byte marker = mbb.get(0); + synchronized (this) { + long maxWait = interval / 10 + 1; + while (marker != TERMINATE) { + // 文件正在被写入或者未被读取 等待 + marker = mbb.get(0); + try { + this.wait(10); + if (--maxWait <= 0) { + // 等待最大时间后 表示没有被读取 即可能根本没有监听线程存活 + break; + } + } catch (InterruptedException e) { + // 等待上一个操作完成 文件写入完毕或者被读取完毕 + } + } + } + mbb.put(0, (byte) 1); + int index = 1; + for (byte b : bytes) { + mbb.put(index++, b); + } + // 标记可读取 + mbb.put(0, (byte) 2); + } + }); } /** diff --git a/autojs-tool-download/build.gradle b/js-supports/autojs-tool-download/build.gradle similarity index 80% rename from autojs-tool-download/build.gradle rename to js-supports/autojs-tool-download/build.gradle index 696ee784..54b1a0e2 100644 --- a/autojs-tool-download/build.gradle +++ b/js-supports/autojs-tool-download/build.gradle @@ -11,13 +11,11 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' } buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -45,6 +43,6 @@ task makeDownloadJar(type: Copy) { } dependencies { - api project(path: ':autojs') - testImplementation 'junit:junit:4.12' + implementation project(path: ':autojs') + testImplementation "junit:junit:$junit_version" } diff --git a/autojs-tool-download/src/androidTest/java/com/tony/ExampleInstrumentedTest.java b/js-supports/autojs-tool-download/src/androidTest/java/com/tony/ExampleInstrumentedTest.java similarity index 100% rename from autojs-tool-download/src/androidTest/java/com/tony/ExampleInstrumentedTest.java rename to js-supports/autojs-tool-download/src/androidTest/java/com/tony/ExampleInstrumentedTest.java diff --git a/autojs-tool-download/src/main/AndroidManifest.xml b/js-supports/autojs-tool-download/src/main/AndroidManifest.xml similarity index 100% rename from autojs-tool-download/src/main/AndroidManifest.xml rename to js-supports/autojs-tool-download/src/main/AndroidManifest.xml diff --git a/autojs-tool-download/src/main/java/com/tony/ProgressInfo.java b/js-supports/autojs-tool-download/src/main/java/com/tony/ProgressInfo.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/ProgressInfo.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/ProgressInfo.java diff --git a/autojs-tool-download/src/main/java/com/tony/downloader/AbstractDownloader.java b/js-supports/autojs-tool-download/src/main/java/com/tony/downloader/AbstractDownloader.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/downloader/AbstractDownloader.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/downloader/AbstractDownloader.java diff --git a/autojs-tool-download/src/main/java/com/tony/downloader/GiteeReleaseDownloader.java b/js-supports/autojs-tool-download/src/main/java/com/tony/downloader/GiteeReleaseDownloader.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/downloader/GiteeReleaseDownloader.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/downloader/GiteeReleaseDownloader.java diff --git a/autojs-tool-download/src/main/java/com/tony/downloader/GithubHistoryTagDownloader.java b/js-supports/autojs-tool-download/src/main/java/com/tony/downloader/GithubHistoryTagDownloader.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/downloader/GithubHistoryTagDownloader.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/downloader/GithubHistoryTagDownloader.java diff --git a/autojs-tool-download/src/main/java/com/tony/downloader/GithubReleaseDownloader.java b/js-supports/autojs-tool-download/src/main/java/com/tony/downloader/GithubReleaseDownloader.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/downloader/GithubReleaseDownloader.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/downloader/GithubReleaseDownloader.java diff --git a/autojs-tool-download/src/main/java/com/tony/listener/DefaultDownloaderListener.java b/js-supports/autojs-tool-download/src/main/java/com/tony/listener/DefaultDownloaderListener.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/listener/DefaultDownloaderListener.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/listener/DefaultDownloaderListener.java diff --git a/autojs-tool-download/src/main/java/com/tony/listener/DownloaderListener.java b/js-supports/autojs-tool-download/src/main/java/com/tony/listener/DownloaderListener.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/listener/DownloaderListener.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/listener/DownloaderListener.java diff --git a/autojs-tool-download/src/main/java/com/tony/resolver/DefaultGSONResolver.java b/js-supports/autojs-tool-download/src/main/java/com/tony/resolver/DefaultGSONResolver.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/resolver/DefaultGSONResolver.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/resolver/DefaultGSONResolver.java diff --git a/autojs-tool-download/src/main/java/com/tony/resolver/JSONResolver.java b/js-supports/autojs-tool-download/src/main/java/com/tony/resolver/JSONResolver.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/resolver/JSONResolver.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/resolver/JSONResolver.java diff --git a/autojs-tool-download/src/main/java/com/tony/util/ZipUtil.java b/js-supports/autojs-tool-download/src/main/java/com/tony/util/ZipUtil.java similarity index 100% rename from autojs-tool-download/src/main/java/com/tony/util/ZipUtil.java rename to js-supports/autojs-tool-download/src/main/java/com/tony/util/ZipUtil.java diff --git a/autojs-tool-download/src/test/java/com/tony/ExampleUnitTest.java b/js-supports/autojs-tool-download/src/test/java/com/tony/ExampleUnitTest.java similarity index 100% rename from autojs-tool-download/src/test/java/com/tony/ExampleUnitTest.java rename to js-supports/autojs-tool-download/src/test/java/com/tony/ExampleUnitTest.java diff --git a/autojs-tool-encrypt/build.gradle b/js-supports/autojs-tool-encrypt/build.gradle similarity index 72% rename from autojs-tool-encrypt/build.gradle rename to js-supports/autojs-tool-encrypt/build.gradle index a6a8250e..79695777 100644 --- a/autojs-tool-encrypt/build.gradle +++ b/js-supports/autojs-tool-encrypt/build.gradle @@ -9,15 +9,11 @@ android { targetSdkVersion 29 versionCode 1 versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' } buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -32,7 +28,8 @@ task makeEncryptJar(type: Copy) { // 删除存在的 delete 'build/libs/encrypt-sdk.jar' // 设置拷贝的文件 - from('build/intermediates/packaged-classes/release/') +// from('build/intermediates/packaged-classes/release/') + from('build/intermediates/aar_main_jar/release/') // 打进jar包后的文件目录 into('build/libs/') // 将classes.jar放入build/libs/目录下 @@ -45,5 +42,5 @@ task makeEncryptJar(type: Copy) { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - api project(path: ':autojs') + implementation project(path: ':autojs') } diff --git a/autojs-tool-encrypt/src/main/AndroidManifest.xml b/js-supports/autojs-tool-encrypt/src/main/AndroidManifest.xml similarity index 100% rename from autojs-tool-encrypt/src/main/AndroidManifest.xml rename to js-supports/autojs-tool-encrypt/src/main/AndroidManifest.xml diff --git a/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/AESEncrypt.java b/js-supports/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/AESEncrypt.java similarity index 100% rename from autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/AESEncrypt.java rename to js-supports/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/AESEncrypt.java diff --git a/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/DecryptRunner.java b/js-supports/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/DecryptRunner.java similarity index 100% rename from autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/DecryptRunner.java rename to js-supports/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/DecryptRunner.java diff --git a/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/EnginesDelegate.java b/js-supports/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/EnginesDelegate.java similarity index 100% rename from autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/EnginesDelegate.java rename to js-supports/autojs-tool-encrypt/src/main/java/com/tony/autojs/tool/encrypt/EnginesDelegate.java diff --git a/autojs-tool-webview/build.gradle b/js-supports/autojs-tool-webview/build.gradle similarity index 90% rename from autojs-tool-webview/build.gradle rename to js-supports/autojs-tool-webview/build.gradle index c2698a41..738b891b 100644 --- a/autojs-tool-webview/build.gradle +++ b/js-supports/autojs-tool-webview/build.gradle @@ -29,7 +29,8 @@ task makeJar(type: Copy) { // 删除存在的 delete 'build/libs/web-bridge-sdk.jar' // 设置拷贝的文件 - from('build/intermediates/packaged-classes/release/') +// from('build/intermediates/packaged-classes/release/') + from('build/intermediates/aar_main_jar/release/') // 打进jar包后的文件目录 into('build/libs/') // 将classes.jar放入build/libs/目录下 diff --git a/autojs-tool-webview/src/main/AndroidManifest.xml b/js-supports/autojs-tool-webview/src/main/AndroidManifest.xml similarity index 100% rename from autojs-tool-webview/src/main/AndroidManifest.xml rename to js-supports/autojs-tool-webview/src/main/AndroidManifest.xml diff --git a/autojs-tool-webview/src/main/java/com/tony/BridgeHandler.java b/js-supports/autojs-tool-webview/src/main/java/com/tony/BridgeHandler.java similarity index 100% rename from autojs-tool-webview/src/main/java/com/tony/BridgeHandler.java rename to js-supports/autojs-tool-webview/src/main/java/com/tony/BridgeHandler.java diff --git a/autojs-tool-webview/src/main/java/com/tony/WebViewBridge.java b/js-supports/autojs-tool-webview/src/main/java/com/tony/WebViewBridge.java similarity index 100% rename from autojs-tool-webview/src/main/java/com/tony/WebViewBridge.java rename to js-supports/autojs-tool-webview/src/main/java/com/tony/WebViewBridge.java