From 9f7faf74d0f284c011c6feccb1baae10e281d6d8 Mon Sep 17 00:00:00 2001
From: Ai <132525856+LZX284@users.noreply.github.com>
Date: Sat, 15 Jul 2023 14:58:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=93=E5=8C=85?=
=?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=9C=BA=E5=88=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=A8=A1=E6=9D=BF=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
去除打包插件机制，直接使用模板打包
编译后的模板文件需要重命名为"template.apk"并放到assets目录下
---
.../autojs/autojs/apkbuilder/ApkPackager.java | 4 +++-
.../autojs/ui/project/BuildActivity.java | 19 +++++++++++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java
index 053d2ad3..a6f268c2 100644
--- a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java
+++ b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkPackager.java
@@ -1,5 +1,7 @@
package org.autojs.autojs.apkbuilder;
+import android.text.TextUtils;
+
import org.autojs.autojs.apkbuilder.util.StreamUtils;
import java.io.File;
@@ -36,7 +38,7 @@ public class ApkPackager {
ZipInputStream zis = new ZipInputStream(mApkInputStream);
for (ZipEntry e = zis.getNextEntry(); e != null; e = zis.getNextEntry()) {
String name = e.getName();
- if (!e.isDirectory()) {
+ if (!e.isDirectory() && !TextUtils.isEmpty(name)) {
File file = new File(mWorkspacePath, name);
System.out.println(file);
file.getParentFile().mkdirs();
diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
index 1d238169..d927a22c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
@@ -34,7 +34,9 @@ import org.autojs.autojs6.R;
import org.autojs.autojs6.databinding.ActivityBuildBinding;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Objects;
import java.util.regex.Pattern;
@@ -96,7 +98,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
if (mSource != null) {
setupWithSourceFile(new ScriptFile(mSource));
}
- checkApkBuilderPlugin();
+// checkApkBuilderPlugin();
}
private void checkApkBuilderPlugin() {
@@ -182,8 +184,16 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
}
void buildApk() {
- if (!ApkBuilderPluginHelper.isPluginAvailable(this)) {
- ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable);
+// if (!ApkBuilderPluginHelper.isPluginAvailable(this)) {
+// ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable);
+// return;
+// }
+ try {
+ if (!Arrays.asList(getAssets().list("")).contains("template.apk")) {
+ return;
+ }
+ } catch (IOException e) {
+ Log.e(LOG_TAG, e.getMessage());
return;
}
if (!checkInputs()) {
@@ -260,7 +270,8 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
}
private ApkBuilder callApkBuilder(File tmpDir, File outApk, ApkBuilder.AppConfig appConfig) throws Exception {
- InputStream templateApk = ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
+// InputStream templateApk = ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
+ InputStream templateApk = getAssets().open("template.apk");
return new ApkBuilder(templateApk, outApk, tmpDir.getPath())
.setProgressCallback(BuildActivity.this)
.prepare()
From e7287c678b52c56664d1d2651cb0b777647afa61 Mon Sep 17 00:00:00 2001
From: Ai <132525856+LZX284@users.noreply.github.com>
Date: Wed, 19 Jul 2023 11:57:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BB=A5=E6=8F=92?=
=?UTF-8?q?=E4=BB=B6=E6=96=B9=E5=BC=8F=E6=89=93=E5=8C=85=EF=BC=8C=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=8C=85=E5=90=8D=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
改为以插件方式打包，避免增加APP体积；
通过包名判断相应插件应用是否存在，并添加包名查询权限。
---
app/src/main/AndroidManifest.xml | 3 +++
.../apkbuilder/ApkBuilderPluginHelper.java | 8 +++++++-
.../autojs/ui/project/BuildActivity.java | 19 ++++---------------
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9e26c272..04e7e9ff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -92,6 +92,9 @@
android:name="android.permission.WRITE_SECURE_SETTINGS"
tools:ignore="ProtectedPermissions" />
+
+
diff --git a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java
index 88614c61..51a585a9 100644
--- a/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java
+++ b/app/src/main/java/org/autojs/autojs/apkbuilder/ApkBuilderPluginHelper.java
@@ -23,7 +23,13 @@ public class ApkBuilderPluginHelper {
private static final boolean DEBUG_APK_PLUGIN = false;
public static boolean isPluginAvailable(Context context) {
- return DeveloperUtils.checkSignature(context, PLUGIN_PACKAGE_NAME);
+// return DeveloperUtils.checkSignature(context, PLUGIN_PACKAGE_NAME);
+ try {
+ context.getPackageManager().getPackageInfo(PLUGIN_PACKAGE_NAME, 0);
+ } catch (PackageManager.NameNotFoundException e) {
+ return false;
+ }
+ return true;
}
public static InputStream openTemplateApk(Context context) {
diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
index d927a22c..1d238169 100644
--- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
@@ -34,9 +34,7 @@ import org.autojs.autojs6.R;
import org.autojs.autojs6.databinding.ActivityBuildBinding;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.Objects;
import java.util.regex.Pattern;
@@ -98,7 +96,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
if (mSource != null) {
setupWithSourceFile(new ScriptFile(mSource));
}
-// checkApkBuilderPlugin();
+ checkApkBuilderPlugin();
}
private void checkApkBuilderPlugin() {
@@ -184,16 +182,8 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
}
void buildApk() {
-// if (!ApkBuilderPluginHelper.isPluginAvailable(this)) {
-// ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable);
-// return;
-// }
- try {
- if (!Arrays.asList(getAssets().list("")).contains("template.apk")) {
- return;
- }
- } catch (IOException e) {
- Log.e(LOG_TAG, e.getMessage());
+ if (!ApkBuilderPluginHelper.isPluginAvailable(this)) {
+ ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable);
return;
}
if (!checkInputs()) {
@@ -270,8 +260,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
}
private ApkBuilder callApkBuilder(File tmpDir, File outApk, ApkBuilder.AppConfig appConfig) throws Exception {
-// InputStream templateApk = ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
- InputStream templateApk = getAssets().open("template.apk");
+ InputStream templateApk = ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
return new ApkBuilder(templateApk, outApk, tmpDir.getPath())
.setProgressCallback(BuildActivity.this)
.prepare()
From be94c0022b8e25013a24f65c18a6bc1551e12649 Mon Sep 17 00:00:00 2001
From: Ai <132525856+LZX284@users.noreply.github.com>
Date: Thu, 20 Jul 2023 22:20:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E4=B8=A4=E7=A7=8D?=
=?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BC=98=E5=85=88?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=86=85=E7=BD=AE=E4=BA=8Eassets=E7=9B=AE?=
=?UTF-8?q?=E5=BD=95=E4=B8=8B=E7=9A=84=E6=89=93=E5=8C=85=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
不确定Autojs6究竟需要哪种打包方式，内置方式还是插件方式好？所以，在代码层面作了兼容。
---
.../autojs/ui/project/BuildActivity.java | 23 ++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
index 1d238169..d08a4e4c 100644
--- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java
@@ -34,7 +34,9 @@ import org.autojs.autojs6.R;
import org.autojs.autojs6.databinding.ActivityBuildBinding;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Objects;
import java.util.regex.Pattern;
@@ -68,6 +70,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
private MaterialDialog mProgressDialog;
private String mSource;
private boolean mIsDefaultIcon = true;
+ private boolean mIsApkTemplateInAssets = false;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -96,7 +99,21 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
if (mSource != null) {
setupWithSourceFile(new ScriptFile(mSource));
}
- checkApkBuilderPlugin();
+ mIsApkTemplateInAssets = checkApkTemplateInAssets();
+ if (!mIsApkTemplateInAssets) {
+ checkApkBuilderPlugin();
+ }
+ }
+
+ private boolean checkApkTemplateInAssets() {
+ try {
+ if (Arrays.asList(getAssets().list("")).contains("template.apk")) {
+ return true;
+ }
+ } catch (IOException e) {
+ Log.e(LOG_TAG, e.getMessage());
+ }
+ return false;
}
private void checkApkBuilderPlugin() {
@@ -182,7 +199,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
}
void buildApk() {
- if (!ApkBuilderPluginHelper.isPluginAvailable(this)) {
+ if (!mIsApkTemplateInAssets && !ApkBuilderPluginHelper.isPluginAvailable(this)) {
ViewUtils.showToast(this, R.string.text_apk_builder_plugin_unavailable);
return;
}
@@ -260,7 +277,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa
}
private ApkBuilder callApkBuilder(File tmpDir, File outApk, ApkBuilder.AppConfig appConfig) throws Exception {
- InputStream templateApk = ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
+ InputStream templateApk = mIsApkTemplateInAssets ? getAssets().open("template.apk") : ApkBuilderPluginHelper.openTemplateApk(BuildActivity.this);
return new ApkBuilder(templateApk, outApk, tmpDir.getPath())
.setProgressCallback(BuildActivity.this)
.prepare()