From: snickersun <scy@incartech.cn>
Date: Fri, 3 Apr 2020 06:37:27 +0000 (+0800)
Subject: 修改计步重置时间从23:59 变更为 00:00.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9423d161784d85601686e3911e4f82f8a7d9b804;p=icsupport.git

修改计步重置时间从23:59 变更为 00:00.
---

diff --git a/app/release/ICSer_V390_2004021710_release.apk b/app/release/ICSer_V390_2004021710_release.apk
deleted file mode 100644
index a55c22ca..00000000
Binary files a/app/release/ICSer_V390_2004021710_release.apk and /dev/null differ
diff --git a/app/release/ICSer_V391_2004031426_release.apk b/app/release/ICSer_V391_2004031426_release.apk
new file mode 100644
index 00000000..1fc47c98
Binary files /dev/null and b/app/release/ICSer_V391_2004031426_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 4fae721a..8ce396bc 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -404,8 +404,8 @@ public class CoreService extends Service {
     }
     private void setCleanStepCountAlarm() {
         /*一天清零一次 计步*/
-        AlarmHelper.setCleanStepCountAlarm(this, 23, 59, STEP_COUNT_ALARM_ACTION);
-//        AlarmHelper.setCleanStepCountAlarm(this, 12, 12, STEP_COUNT_ALARM_ACTION);
+//        AlarmHelper.setCleanStepCountAlarm(this, 23, 59, STEP_COUNT_ALARM_ACTION);
+        AlarmHelper.setCleanStepCountAlarm(this, 0, 0, STEP_COUNT_ALARM_ACTION);
     }
 
     private void setSleepAlarm() {
@@ -730,7 +730,7 @@ public class CoreService extends Service {
                             return Service.START_STICKY;
                         }
                     } else   if (STEP_COUNT_ALARM_ACTION.equals(paramIntent.getAction())) {
-                        ICLogger.i("Reset Count At 23:59 ");
+                        ICLogger.i("Reset Count At 00:00 ");
                         //update stepCount and broadcast before reset
                         this.locationClient.updateStepCount();
                         runtime.getContextProxy().brodcastResetStepCount(runtime.getTotalStepCount());
diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
index 25081192..1c9dbcde 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
@@ -62,17 +62,17 @@ public class AlarmHelper {
     Intent intent = new Intent(context, com.enqualcomm.support.CoreService.class);
     intent.setAction(paramString);
     PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-    long l3 = System.currentTimeMillis();
+    long currentMS = System.currentTimeMillis();
     Calendar calendar = Calendar.getInstance();
     calendar.set(Calendar.HOUR_OF_DAY, hour);
     calendar.set(Calendar.MINUTE, minutes);
     calendar.set(Calendar.SECOND, 0);
-    long l2 = calendar.getTimeInMillis();
-    long l1 = l2;
-    if (l2 < l3)
-      l1 = l2 + ONE_DAY;
+    long targetMStmp = calendar.getTimeInMillis();
+    long targetMS = targetMStmp;
+    if (targetMStmp < currentMS)
+      targetMS = targetMStmp + ONE_DAY;
     alarmManager.cancel(pendingIntent);
-    alarmManager.setExact(AlarmManager.RTC_WAKEUP, l1, pendingIntent);
+    alarmManager.setExact(AlarmManager.RTC_WAKEUP, targetMS, pendingIntent);
   }
   
   public static void setRealTimeAlarm(Context context, int minutes, String actionname) {
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index 857454c3..7244a0f0 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -198,13 +198,7 @@ public class ProcessReceiver extends BroadcastReceiver {
     stringBuilder.append("action==");
     stringBuilder.append(str);
     ICLogger.i(stringBuilder.toString());
-    if (STEP_COUNT_ALARM_ACTION.equals(str)) {
-      ICLogger.i("Reset Count At 23:59 ");
-      ICJniUtils.resetStepCount();
-      AlarmHelper.setCleanStepCountAlarm(paramContext, 23, 59, STEP_COUNT_ALARM_ACTION);
-
-      return;
-    }else  if (RESUME_ACTION.equals(str)) {
+    if (RESUME_ACTION.equals(str)) {
       SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
       return;
     }else if (ACTION_REMOTE_CAMERA.equals(str)) {
diff --git a/app/version_code.properties b/app/version_code.properties
index 82b5ceea..de8702ae 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Apr 02 17:10:56 CST 2020
-VERSION_CODE=390
+#Fri Apr 03 14:26:47 CST 2020
+VERSION_CODE=391