From d38cbbd102ba22f99864a33c96bfeab5ead8ecd9 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 22 Jun 2024 13:47:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E4=B8=8D=E8=B7=9F=E9=9A=8FMpAPP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xypower/mpmaster/MpMasterService.java | 6 ++++-- 1 file changed, 4 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 9ebeb139..caee4379 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -463,9 +463,10 @@ public class MpMasterService extends Service { mService.startMpApp(); } else if (TextUtils.equals(MicroPhotoContext.ACTION_HEARTBEAT_MP, action)) { + mService.mPreviousMpHbTime = System.currentTimeMillis(); - if (!mService.mSeparateNetwork || (mService.mMntnMode || mService.mQuickHbMode)) { + if (!mService.mSeparateNetwork && (!mService.mMntnMode)) { mService.logger.info("Heartbeat Timer Fired By MpAPP ACTION=" + action); long ts = System.currentTimeMillis(); @@ -476,6 +477,7 @@ public class MpMasterService extends Service { mService.startMaster(true); mService.startMpApp(); } + } else if (TextUtils.equals(ACTION_UPDATE_CONFIGS, action)) { int restart = intent.getIntExtra("restart", 0); mService.logger.info("Update Config Fired ACTION=" + action + " restart=" + restart); @@ -600,7 +602,7 @@ public class MpMasterService extends Service { Date dt = new Date(triggerTime); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - logger.info(String.format("Register HB:" + format.format(dt))); + logger.info(String.format("Register HB:" + format.format(dt)) + " MntnMode" + (mMntnMode ? "1" : "0") + " QuickHb=" + (mQuickHbMode ? "1" : "0")); mPreviousHB = pendingIntent; mPreviousHeartbeatTime = triggerTime; alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerTime, pendingIntent);