From 02c068fe8a2491cf7fd81bc51924baae697b4f10 Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 9 Sep 2024 19:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E9=87=8D=E5=90=AFMpAPP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xypower/mpmaster/MpMasterService.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 026c976d..0ae2c614 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -363,26 +363,32 @@ public class MpMasterService extends Service { return; } - String appPath = MicroPhotoContext.buildMpAppDir(context); - long ts = System.currentTimeMillis(); + final String appPath = MicroPhotoContext.buildMpAppDir(context); + final long ts = System.currentTimeMillis(); if (ts - mTimeToStartMpApp < 30000) { logger.warning("MpAPP is STILL Running"); return; } - File mpappHb = new File(appPath + "data/alive/hb"); - long modifiedTimeOfHb = getFileModificationTime(appPath + "data/alive/hb"); - long modifiedTimeOfPhoto = getFileModificationTime(appPath + "data/alive/taking"); - long modifiedTimeOfUpload = getFileModificationTime(appPath + "data/alive/upload"); + final File mpappHb = new File(appPath + "data/alive/hb"); + final long modifiedTimeOfHb = getFileModificationTime(appPath + "data/alive/hb"); + final long modifiedTimeOfPhoto = getFileModificationTime(appPath + "data/alive/taking"); + final long modifiedTimeOfUpload = getFileModificationTime(appPath + "data/alive/upload"); if (((ts - modifiedTimeOfHb) > mTimeOfMpAppAlive) || ((ts - modifiedTimeOfPhoto) > mTimeOfMpAppAlive * 4) || ((ts - modifiedTimeOfUpload) > mTimeOfMpAppAlive * 4)) { - // greater than 30m - 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; + mHander.postDelayed(new Runnable() { + @Override + public void run() { + // greater than 30m + 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 = System.currentTimeMillis(); + } + }, 60000); + } } catch (Exception ex) { ex.printStackTrace();