Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

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

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) +