From 874f7db0cd1a7d96437808d020637f431e739a24 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Fri, 14 Feb 2025 16:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=80=9A=E7=94=A8=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=AE=E6=94=B9=E4=B8=AD=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=AD=98=E5=82=A8=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xypower/mpmaster/sms/UpdateSysConfigUtil.java | 7 +++----
 .../main/java/com/xypower/mpmaster/sms/ValueTypeUtil.java  | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/sms/UpdateSysConfigUtil.java b/mpmaster/src/main/java/com/xypower/mpmaster/sms/UpdateSysConfigUtil.java
index 6260e2e4..95c73cdd 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/sms/UpdateSysConfigUtil.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/sms/UpdateSysConfigUtil.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 
 public class UpdateSysConfigUtil {
-    public static final String PACKAGE_NAME_MPAPP = "com.xypower.mpapp";
     public static final String APP_ACTION_UPDATE_CONFIGS = "com.xypower.mpapp.ACT_UPD_CFG";
     private static final String MASTER_ACTION_UPDATE_CONFIGS = "com.xypower.mpmaster.ACT_UPD_CFG";
 
@@ -63,7 +62,7 @@ public class UpdateSysConfigUtil {
 
     //获取配置文件地址
     public static String getChannelDir(int channel) {
-        String appPath = buildAppDir(PACKAGE_NAME_MPAPP);
+        String appPath = buildAppDir(MicroPhotoContext.PACKAGE_NAME_MPAPP);
         String path = appPath + "data/channels/" + channel + ".json";
         return path;
     }
@@ -71,7 +70,7 @@ public class UpdateSysConfigUtil {
 
     //获取配置文件地址
     public static String getMpAppDir() {
-        String appPath = buildAppDir(PACKAGE_NAME_MPAPP);
+        String appPath = buildAppDir(MicroPhotoContext.PACKAGE_NAME_MPAPP);
         String content = FilesUtils.readTextFile(appPath + "data/Master.json");
         return content;
     }
@@ -89,7 +88,7 @@ public class UpdateSysConfigUtil {
 
     //获取配置文件地址
     public static String getScheduleDir(int channel) {
-        String appPath = buildAppDir(PACKAGE_NAME_MPAPP);
+        String appPath = buildAppDir(MicroPhotoContext.PACKAGE_NAME_MPAPP);
         String path = appPath + "data/schedules/" + channel;
         return path;
     }
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/sms/ValueTypeUtil.java b/mpmaster/src/main/java/com/xypower/mpmaster/sms/ValueTypeUtil.java
index f5b043b8..86b08cc5 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/sms/ValueTypeUtil.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/sms/ValueTypeUtil.java
@@ -39,11 +39,11 @@ public class ValueTypeUtil {
         String fileName = null;
         switch (fileType) {
             case 1:
-                filePath = MicroPhotoContext.buildMpAppDir(context) + "/data/";
+                filePath =MicroPhotoContext.PACKAGE_NAME_MPAPP + "/data/";
                 fileName = "App.json";
                 break;
             case 2:
-                filePath = MicroPhotoContext.buildMasterAppDir(context) + "/data/";
+                filePath =MicroPhotoContext.PACKAGE_NAME_MPMASTER + "/data/";
                 fileName = "Master.json";
                 break;
             case 91:
@@ -55,7 +55,7 @@ public class ValueTypeUtil {
             case 97:
             case 98:
             case 99:
-                filePath = MicroPhotoContext.buildMpAppDir(context) + "/data/channels/";
+                filePath =MicroPhotoContext.PACKAGE_NAME_MPAPP + "/data/channels/";
                 fileName = Integer.toString(fileType - 90) + ".json";
                 break;
             default: