From 27c6716fd7c52c0b17c364bb29b3e3b8a5bb9c26 Mon Sep 17 00:00:00 2001
From: BlueMatthew <wakinchau@msn.com>
Date: Sun, 4 Feb 2024 00:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=8D=87=E7=BA=A7=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xypower/mpmaster/MpMasterService.java | 22 +++++++++++++++++--
 .../com/xypower/mpmaster/UpdateReceiver.java  |  1 +
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
index 40c81560..5c7dbbb4 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
@@ -113,9 +113,9 @@ public class MpMasterService extends Service {
 
     private String mModelName = null;
 
-    private String mMpAppVersion = null;
+    private static String mMpAppVersion = null;
 
-    private String mMpMasterVersion = null;
+    private static String mMpMasterVersion = null;
 
     public MpMasterService() {
     }
@@ -196,10 +196,28 @@ public class MpMasterService extends Service {
     }
 
     public String getMpAppVersion() {
+        if (TextUtils.isEmpty(mMpAppVersion)) {
+            PackageManager packageManager = getPackageManager();
+            PackageInfo packageInfo = null;
+            try {
+                packageInfo = packageManager.getPackageInfo(MicroPhotoContext.PACKAGE_NAME_MPAPP, 0);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+            mMpAppVersion = packageInfo == null ? "" : packageInfo.versionName;
+        }
         return mMpAppVersion;
     }
 
+    public static void resetVersions() {
+        mMpAppVersion = null;
+        mMpMasterVersion = null;
+    }
+
     public String getMasterAppVersion() {
+        if (TextUtils.isEmpty(mMpMasterVersion)) {
+            mMpMasterVersion = MicroPhotoContext.getVersionName(getApplicationContext());
+        }
         return mMpMasterVersion;
     }
 
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/UpdateReceiver.java b/mpmaster/src/main/java/com/xypower/mpmaster/UpdateReceiver.java
index 9dc9e853..82bd571a 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/UpdateReceiver.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/UpdateReceiver.java
@@ -22,6 +22,7 @@ public class UpdateReceiver extends BroadcastReceiver {
     private void packageChanged(Context context, String action, String packageName, String targetPackageName) {
         if (action.equals(Intent.ACTION_PACKAGE_REPLACED)) { // Upgrade Broadcast
             Log.e(TAG, "onReceive:Upgraded and Restart the App:" + targetPackageName);
+            MpMasterService.resetVersions();
             if (packageName.equals("package:" + targetPackageName)) {
                 // SysApi.enableApp(context, targetPackageName);
                 restartAPP(context, targetPackageName);