From: snicker <snickersun@163.com>
Date: Mon, 4 May 2020 00:40:45 +0000 (+0800)
Subject: 修复如果resetCount前关机，当天就不会重置计步的问题。增加逻辑，当天开机第一次，会重置计步。
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=22aabc5fb8bd700a3a95cc3ddf3cf6372d290901;p=icsupport.git

修复如果resetCount前关机，当天就不会重置计步的问题。增加逻辑，当天开机第一次，会重置计步。
---

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 6a02d909..8f346739 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -7,10 +7,13 @@ import android.text.TextUtils;
 import com.enqualcomm.support.bean.ICLocation;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.TimeUtil;
 
 import org.json.JSONException;
 import org.json.JSONStringer;
 
+import java.util.concurrent.TimeUnit;
+
 import static com.enqualcomm.support.utils.Util.getSystemProperties;
 
 public class Config {
@@ -260,5 +263,29 @@ public class Config {
     return SharPreferenceUtil.getPrefInt(context,KeyLocationMode, ICLocation.NORMAL_MOD);
   }
 
+  private static final String KeyBootUpDate = "bootupdate";
+  private static int bootupcount=0;
+  public static boolean logBootDate(Context context){
+  //如果时间和最后一次时间不同，则重置，否则启动次数+1
+    if (isFirstBootToday(context)) {
+      SharPreferenceUtil.setPrefString(context, KeyBootUpDate, TimeUtil.getSystemTime4());
+      return true;
+    }else{
+      bootupcount++;
+      return false;
+    }
+  }
+
+  private static String getLastBootupDate(Context context){
+    return SharPreferenceUtil.getPrefString(context,KeyBootUpDate,"");
+  }
+  private static boolean isFirstBootToday(Context context){
+
+    if (TimeUtil.getSystemTime4()!=getLastBootupDate(context)) {
+      bootupcount=1;
+      return true;
+    }else
+      return false;
+  }
 }
 
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 0bb854d9..ad69682c 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -523,6 +523,11 @@ public class CoreService extends Service {
 
         //保证获取正确的计步数据及其他参数初始化
         loadStepCount();
+
+        if (Config.logBootDate(this)){
+            resetStepCount();
+        }
+
         //初始化ServerHeartBeat Cycle
         Config.loadHearBeatSetting(runtime);
         //初始化PPG，LocationMod，LocationCycle
@@ -635,6 +640,8 @@ public class CoreService extends Service {
 
         //备份DB数据到sd cache目录，为调试方便
         getDBFile();
+
+
     }
 
     public static void DevliverStringMessage(String cmd){