diff --git a/common/src/main/java/com/xypower/common/MicroPhotoContext.java b/common/src/main/java/com/xypower/common/MicroPhotoContext.java index 6dc3fdbf..9d219484 100644 --- a/common/src/main/java/com/xypower/common/MicroPhotoContext.java +++ b/common/src/main/java/com/xypower/common/MicroPhotoContext.java @@ -229,7 +229,7 @@ public class MicroPhotoContext { public static MasterConfig getMasterConfig(Context context) { MasterConfig masterConfig = new MasterConfig(); - String appPath = buildAppDir(context); + String appPath = buildMasterAppDir(context); try { String content = readTextFile(appPath + "data/Master.json"); diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java index 5307a61c..98e92ca1 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java @@ -131,6 +131,7 @@ public class AppMaster { NetworkInfo ni = connectivityManager.getNetworkInfo(nw); if (ni.getType() == 0) { + connected = true; break; } } diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index d37bb488..ccd3cc94 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -122,6 +122,8 @@ public class MpMasterService extends Service { public void onCreate() { super.onCreate(); + loadConfig(); + try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { mSerialNo = Build.getSerial(); @@ -216,6 +218,7 @@ public class MpMasterService extends Service { mUsingAbsHbTime = masterConfig.usingAbsHbTime != 0; mHeartbeatDuration = masterConfig.heartbeat * 10; // minute to second mAbsHeartbeatTimes = masterConfig.absHeartbeats; + mSeparateNetwork = masterConfig.separateNetwork != 0; } // public boolean useSeparater