From 33b62913a816d9bef6241d12bd1d62b5a1fe3651 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Fri, 12 Jul 2024 17:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xypower/mpmaster/MpMasterService.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
index 7b73c568..dc90962b 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
@@ -359,12 +359,14 @@ public class MpMasterService extends Service {
             final Context context = getApplicationContext();
 
             if (MicroPhotoContext.isAppAlive(context, MicroPhotoContext.PACKAGE_NAME_MPAPP)) {
+                logger.warning("MpAPP is STILL Running");
                 return;
             }
 
             String appPath = MicroPhotoContext.buildMpAppDir(context);
             long ts = System.currentTimeMillis();
             if (ts - mTimeToStartMpApp < 30000) {
+                logger.warning("MpAPP is STILL Running");
                 return;
             }
 
@@ -377,12 +379,13 @@ public class MpMasterService extends Service {
                     ((ts - modifiedTimeOfPhoto) > mTimeOfMpAppAlive * 4) ||
                     ((ts - modifiedTimeOfUpload) > mTimeOfMpAppAlive * 4)) {
                 // greater than 30m
-                logger.warning("Restart MpAPP as it is NOT Running");
+                logger.warning("Restart MpAPP as it is NOT Running hb=" + Long.toString(ts - modifiedTimeOfHb) +
+                        " taking=" + Long.toString(ts - modifiedTimeOfPhoto) + " sending=" + Long.toString(ts - modifiedTimeOfUpload));
                 MicroPhotoContext.restartMpApp(context);
                 mTimeToStartMpApp = ts;
             }
         } catch (Exception ex) {
-
+            ex.printStackTrace();
         }
     }
 
@@ -494,6 +497,7 @@ public class MpMasterService extends Service {
                 }
 
                 mService.mPreviousHB = null;
+                mService.mPreviousHeartbeatTime = 0;
                 mService.registerHeartbeatTimer();
 
                 if (!keepAlive) {