From: snickersun <scy@incartech.cn>
Date: Thu, 2 Apr 2020 09:13:28 +0000 (+0800)
Subject: release V390
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=2f27a1bd5ca73767e9df5f5c07f5fc7438a4810e;p=icsupport.git

release V390
在重置计步前，先更新到最新，然后broadcast 给其他应用。
---

diff --git a/app/release/ICSer_V389_2004011142_release.apk b/app/release/ICSer_V389_2004011142_release.apk
deleted file mode 100644
index 7474daf2..00000000
Binary files a/app/release/ICSer_V389_2004011142_release.apk and /dev/null differ
diff --git a/app/release/ICSer_V390_2004021710_release.apk b/app/release/ICSer_V390_2004021710_release.apk
new file mode 100644
index 00000000..a55c22ca
Binary files /dev/null and b/app/release/ICSer_V390_2004021710_release.apk differ
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index f0a94b9a..4fae721a 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -20,6 +20,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.enqualcomm.support.bean.ICLocation;
+import com.enqualcomm.support.bean.StepCount;
 import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.ServiceUtil;
 import com.enqualcomm.support.utils.StorageUtils;
@@ -730,6 +731,9 @@ public class CoreService extends Service {
                         }
                     } else   if (STEP_COUNT_ALARM_ACTION.equals(paramIntent.getAction())) {
                         ICLogger.i("Reset Count At 23:59 ");
+                        //update stepCount and broadcast before reset
+                        this.locationClient.updateStepCount();
+                        runtime.getContextProxy().brodcastResetStepCount(runtime.getTotalStepCount());
                         resetStepCount();
                         setCleanStepCountAlarm();
 
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
index 7c235782..d566d2ea 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -280,7 +280,14 @@ public class ContextProxy {
       }
     }
   }
-
+  private static final String PED_TOTAL_KEY = "PED_TOTAL";
+  private static final String PED_FINISH_ACTION = "com.ic.action.PED_FINISH";
+  public void brodcastResetStepCount(int StepCount){
+    Intent intent = new Intent();
+    intent.putExtra(PED_TOTAL_KEY, StepCount);
+    intent.setAction(PED_FINISH_ACTION);
+    this.context.sendBroadcast(intent);
+  }
   public void sendBrodcast(String action,Intent intent){
     intent.setAction(action);
     this.context.sendBroadcast(intent);
diff --git a/app/version_code.properties b/app/version_code.properties
index 8ee1985d..82b5ceea 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Apr 01 11:42:50 CST 2020
-VERSION_CODE=389
+#Thu Apr 02 17:10:56 CST 2020
+VERSION_CODE=390