From e2455cfd5a24c05027bf42e5003bc03460caa184 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 11:42:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=97=A0=E6=8B=8D=E7=85=A7=E9=87=8D=E5=90=AF=EF=BC=88=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xypower/mpmaster/MpMasterService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java index 1030a698..7068d558 100644 --- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java +++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java @@ -440,9 +440,10 @@ public class MpMasterService extends Service { 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)) { + if (((ts - modifiedTimeOfHb) > mTimeOfMpAppAlive) //|| +// ((ts - modifiedTimeOfPhoto) > mTimeOfMpAppAlive * 4) || +// ((ts - modifiedTimeOfUpload) > mTimeOfMpAppAlive * 4) + ) { if (ts - mTimeToStartMpApp >= 1800000) { String msg = "Restart MpAPP as it is NOT Running hb=" + Long.toString(ts - modifiedTimeOfHb) + From 7d8c5d2342e83aa38f8cf1bee36776ad7ece4849 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 11:44:36 +0800 Subject: [PATCH 2/2] Update MpMaster version to 1.0.89 --- mpmaster/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpmaster/build.gradle b/mpmaster/build.gradle index 362a334d..dea51ff9 100644 --- a/mpmaster/build.gradle +++ b/mpmaster/build.gradle @@ -4,7 +4,7 @@ plugins { def AppMajorVersion = 1 def AppMinorVersion = 0 -def AppBuildNumber = 88 +def AppBuildNumber = 89 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber