From 5dec91092698b356aff629ec36df9abcbb8a41bc Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sun, 21 Apr 2024 11:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2simcard?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/java/com/xypower/common/MicroPhotoContext.java | 2 +-
 mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java     | 1 +
 .../src/main/java/com/xypower/mpmaster/MpMasterService.java    | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

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