调整保活检测机制

mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java

@@ -350,12 +350,14 @@ public class MpMasterService extends Service {
                 return;
             }
 
-            File mpappDb = new File(appPath + "data/App.db");
+            File mpappHb = new File(appPath + "data/alive/hb");
-            long modifiedTimeOfDb = 0;
+            long modifiedTimeOfHb = getFileModificationTime(appPath + "data/alive/hb");
-            if (mpappDb.exists()) {
+            long modifiedTimeOfPhoto = getFileModificationTime(appPath + "data/alive/taking");
-                modifiedTimeOfDb = mpappDb.lastModified();
+            long modifiedTimeOfUpload = getFileModificationTime(appPath + "data/alive/upload");
-            }
+
-            if ((ts - modifiedTimeOfDb) > mTimeOfMpAppAlive) {
+            if (((ts - modifiedTimeOfHb) > mTimeOfMpAppAlive) ||
+                    ((ts - modifiedTimeOfPhoto) > mTimeOfMpAppAlive * 4) ||
+                    ((ts - modifiedTimeOfUpload) > mTimeOfMpAppAlive * 4)) {
                 // greater than 30m
                 logger.warning("Start MpAPP as it is NOT running");
                 MicroPhotoContext.restartMpApp(context);
@@ -366,6 +368,16 @@ public class MpMasterService extends Service {
         }
     }
 
+    long getFileModificationTime(String path) {
+        File file = new File(path);
+        long mt = 0;
+        if (file.exists()) {
+            mt = file.lastModified();
+        }
+
+        return mt;
+    }
+
     public String getMpAppVersion() {
         if (TextUtils.isEmpty(mMpAppVersion)) {
             PackageManager packageManager = getPackageManager();