From 6b2b9df376d84adffe933b8762bc1d50341f5dca Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Wed, 19 Jun 2024 16:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BF=AB=E5=BF=83=E8=B7=B3?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xypower/common/MicroPhotoContext.java |  3 +++
 .../com/xypower/mpmaster/MpMasterService.java | 27 ++++---------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/common/src/main/java/com/xypower/common/MicroPhotoContext.java b/common/src/main/java/com/xypower/common/MicroPhotoContext.java
index 2ff4475b..d5125cbc 100644
--- a/common/src/main/java/com/xypower/common/MicroPhotoContext.java
+++ b/common/src/main/java/com/xypower/common/MicroPhotoContext.java
@@ -36,6 +36,7 @@ public class MicroPhotoContext {
     public final static int DEFAULT_PROTOCOL = 0xFF00;
     public final static int DEFAULT_HEARTBEAT_TIME_FOR_SEPARATE_NW = 575; //   9:35
     public final static int DEFAULT_HEARTBEAT_FOR_SHARED_NW = 10;  // minutes
+    public final static int DEFAULT_QUICK_HEARTBEAT = 60;  // second
 
 
     public static class AppConfig {
@@ -58,6 +59,7 @@ public class MicroPhotoContext {
         public int quickHbMode;
         public int usingAbsHbTime;
         public int heartbeat;   // Unit minute
+        public int quickHeartbeat;   // Unit second
         public int[] absHeartbeats; // second
         public int separateNetwork;
         public int mpappMonitorTimeout = 30 * 60000;    // 30 minutes
@@ -302,6 +304,7 @@ public class MicroPhotoContext {
 
             // long defaultHearbeat = masterConfig.separateNetwork == 0 ? DEFAULT_HEARTBEAT_FOR_SHARED_NW : DEFAULT_HEARTBEAT_FOR_SEPARATE_NW;
             masterConfig.heartbeat = jsonObject.optInt("heartbeat", DEFAULT_HEARTBEAT_FOR_SHARED_NW);
+            masterConfig.quickHeartbeat = jsonObject.optInt("quickHeartbeat", DEFAULT_QUICK_HEARTBEAT);
             if (jsonObject.has("absHeartbeats")) {
                 JSONArray jsonHbs = jsonObject.getJSONArray("absHeartbeats");
                 masterConfig.absHeartbeats = new int[jsonHbs.length()];
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
index 0d46f354..9ebeb139 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
@@ -98,14 +98,14 @@ public class MpMasterService extends Service {
     private boolean mUsingAbsHbTime = false;
     private String mCmdid = "";
     private NotificationManager mNotificationManager;
-    private int mQuickHeartbeatDuration = 60; // 1m = 60 s
+    private int mQuickHeartbeatDuration = 60; // Unit: second
     private int mHeartbeatDuration = 600; // 10m = 10 * 60s
 
     private AlarmReceiver mAlarmReceiver = null;
     private ScreenActionReceiver mScreenaAtionReceiver = null;
     private UpdateReceiver mUpdateReceiver = null;
 
-    private ServiceHandler mHander = null;
+    private Handler mHander = null;
 
     private String mModelName = null;
 
@@ -202,7 +202,7 @@ public class MpMasterService extends Service {
 
         logger.info("MpMaster started version=" + mMpMasterVersion);
 
-        mHander = new ServiceHandler();
+        mHander = new Handler();
 
         mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
         mStateService = STATE_SERVICE.NOT_CONNECTED;
@@ -213,9 +213,6 @@ public class MpMasterService extends Service {
         {
             mAlarmReceiver = new AlarmReceiver(this);
             IntentFilter intentFilter = new IntentFilter(ACTION_HEARTBEAT);
-            // intentFilter.addAction(ACTION_TAKE_PHOTO);
-            // intentFilter.addAction(ACTION_TIMEOUT);
-            // intentFilter.addAction(ACTION_TAKE_PHOTO_MANUALLY);
             intentFilter.addAction(ACTION_MSG_BROADCAST);
             intentFilter.addAction(ACTION_UPDATE_CONFIGS);
             intentFilter.addAction(ACTION_UPD_OTA);
@@ -236,7 +233,7 @@ public class MpMasterService extends Service {
             registerReceiver(mUpdateReceiver, intentFilter);
         }
 
-        //自定义发送短信广播接收器
+        // SMS broadcast receiver
         mSmsSnedReceiver = new SmsSendReceiver();
         IntentFilter intentFilter;
         intentFilter = new IntentFilter(SimUtil.SMS_SEND_ACTION);
@@ -273,27 +270,13 @@ public class MpMasterService extends Service {
         super.onDestroy();
     }
 
-    public static class ServiceHandler extends Handler {
-        @Override
-        public void dispatchMessage(Message msg) {
-            super.dispatchMessage(msg);
-            // Log.i("life", "MyHandler----dispatchMessage");
-            // Log.i("life", Thread.currentThread().getName());
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            // Log.i("life", "MyHandler----handleMessage");
-        }
-    }
-
     protected void loadConfig() {
         MicroPhotoContext.MasterConfig masterConfig = MicroPhotoContext.getMasterConfig(getApplicationContext());
         mMntnMode = masterConfig.mntnMode != 0;
         mQuickHbMode = masterConfig.quickHbMode != 0;
         mUsingAbsHbTime = masterConfig.usingAbsHbTime != 0;
         mHeartbeatDuration = masterConfig.heartbeat * 60;   // minute to second
+        mQuickHeartbeatDuration = masterConfig.quickHeartbeat;
         mAbsHeartbeatTimes = masterConfig.absHeartbeats;
         if (mAbsHeartbeatTimes != null && mAbsHeartbeatTimes.length > 0) {
             Arrays.sort(mAbsHeartbeatTimes);