From a95958cf20e7504e227035f926aaaf3a0eeb7878 Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Tue, 22 Apr 2025 02:34:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85xapk?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/mir4updater/activity/main/MainActivity.java  | 9 +++++++++
 .../java/com/example/mir4updater/utils/XapkUtils.java    | 8 +++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/example/mir4updater/activity/main/MainActivity.java b/app/src/main/java/com/example/mir4updater/activity/main/MainActivity.java
index 8009f28..c244d1f 100644
--- a/app/src/main/java/com/example/mir4updater/activity/main/MainActivity.java
+++ b/app/src/main/java/com/example/mir4updater/activity/main/MainActivity.java
@@ -566,6 +566,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
             Toaster.show("文件不存在");
             return;
         }
+
         XapkUtils xapkUtils =new XapkUtils(MainActivity.this);
         xapkUtils.setApkFilePath(file.getAbsolutePath());
         xapkUtils.installXapk();
@@ -579,6 +580,14 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, ActivityMainBi
 //        if (xapkInstaller != null) {
 //            xapkInstaller.installXapk(MainActivity.this);
 //        }
+//        try {
+//            XapkUtils.unzipXapk(MainActivity.this, file);
+//            File outputDir = new File(getExternalCacheDir(), "xapk_unzip");
+//            XapkUtils.installXapk(MainActivity.this, outputDir);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+
     }
 
     private void requestPackageInstalls() {
diff --git a/app/src/main/java/com/example/mir4updater/utils/XapkUtils.java b/app/src/main/java/com/example/mir4updater/utils/XapkUtils.java
index 2c98990..7e07fc0 100644
--- a/app/src/main/java/com/example/mir4updater/utils/XapkUtils.java
+++ b/app/src/main/java/com/example/mir4updater/utils/XapkUtils.java
@@ -96,7 +96,7 @@ public class XapkUtils {
                 if (ZipUtil.containsEntry(mApkFile, "manifest.json")) {
                     //判断json文件是否存在
                     String dirName = FileUtils.getFileNoExName(mApkFile.getAbsolutePath());
-                    mUnpackPath = mContext.getExternalCacheDir()+ File.separator + "xapk_unzip" + File.separator + dirName;
+                    mUnpackPath = mContext.getExternalCacheDir() + File.separator + "xapk_unzip" + File.separator + dirName;
                     File unpackDir = new File(mUnpackPath);
                     ZipUtil.unpack(mApkFile, unpackDir);
                     String jsonString = JsonUtils.readJsonFile(unpackDir.getAbsolutePath() + File.separator + "manifest.json");
@@ -304,7 +304,6 @@ public class XapkUtils {
             Toaster.show("正在安装应用");
             install(packageInstaller, sessionId, mContext);
 //            }
-//
         }
     }
 
@@ -315,10 +314,9 @@ public class XapkUtils {
 
 //            Intent intent = new Intent(context, InstallResultReceiver.class);
 //            PendingIntent pendingIntent = PendingIntent.getBroadcast(
-//                    context,
-//                    0, intent,
-//                    PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
+//                    context, sessionId, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
 //            );
+
             Intent intent = new Intent(mContext, InstallActivity.class);
             intent.setAction(PACKAGE_INSTALLED_ACTION);
             PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);