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] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=89=93=E5=8C=85=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=BA=E5=88=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BD=BF?=
 =?UTF-8?q?=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()