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: