修改计步重置时间从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 (file)
index a55c22c..0000000
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 (file)
index 0000000..1fc47c9
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 4fae721..8ce396b 100644 (file)
--- 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 {
     }\r
     private void setCleanStepCountAlarm() {\r
         /*一天清零一次 计步*/\r
-        AlarmHelper.setCleanStepCountAlarm(this, 23, 59, STEP_COUNT_ALARM_ACTION);\r
-//        AlarmHelper.setCleanStepCountAlarm(this, 12, 12, STEP_COUNT_ALARM_ACTION);\r
+//        AlarmHelper.setCleanStepCountAlarm(this, 23, 59, STEP_COUNT_ALARM_ACTION);\r
+        AlarmHelper.setCleanStepCountAlarm(this, 0, 0, STEP_COUNT_ALARM_ACTION);\r
     }\r
 \r
     private void setSleepAlarm() {\r
@@ -730,7 +730,7 @@ public class CoreService extends Service {
                             return Service.START_STICKY;\r
                         }\r
                     } else   if (STEP_COUNT_ALARM_ACTION.equals(paramIntent.getAction())) {\r
-                        ICLogger.i("Reset Count At 23:59 ");\r
+                        ICLogger.i("Reset Count At 00:00 ");\r
                         //update stepCount and broadcast before reset\r
                         this.locationClient.updateStepCount();\r
                         runtime.getContextProxy().brodcastResetStepCount(runtime.getTotalStepCount());\r

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 2508119..1c9dbcd 100644 (file)
--- 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);\r
     intent.setAction(paramString);\r
     PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);\r
-    long l3 = System.currentTimeMillis();\r
+    long currentMS = System.currentTimeMillis();\r
     Calendar calendar = Calendar.getInstance();\r
     calendar.set(Calendar.HOUR_OF_DAY, hour);\r
     calendar.set(Calendar.MINUTE, minutes);\r
     calendar.set(Calendar.SECOND, 0);\r
-    long l2 = calendar.getTimeInMillis();\r
-    long l1 = l2;\r
-    if (l2 < l3)\r
-      l1 = l2 + ONE_DAY;\r
+    long targetMStmp = calendar.getTimeInMillis();\r
+    long targetMS = targetMStmp;\r
+    if (targetMStmp < currentMS)\r
+      targetMS = targetMStmp + ONE_DAY;\r
     alarmManager.cancel(pendingIntent);\r
-    alarmManager.setExact(AlarmManager.RTC_WAKEUP, l1, pendingIntent);\r
+    alarmManager.setExact(AlarmManager.RTC_WAKEUP, targetMS, pendingIntent);\r
   }\r
   \r
   public static void setRealTimeAlarm(Context context, int minutes, String actionname) {\r

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 857454c..7244a0f 100644 (file)
--- 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==");\r
     stringBuilder.append(str);\r
     ICLogger.i(stringBuilder.toString());\r
-    if (STEP_COUNT_ALARM_ACTION.equals(str)) {\r
-      ICLogger.i("Reset Count At 23:59 ");\r
-      ICJniUtils.resetStepCount();\r
-      AlarmHelper.setCleanStepCountAlarm(paramContext, 23, 59, STEP_COUNT_ALARM_ACTION);\r
-\r
-      return;\r
-    }else  if (RESUME_ACTION.equals(str)) {\r
+    if (RESUME_ACTION.equals(str)) {\r
       SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));\r
       return;\r
     }else if (ACTION_REMOTE_CAMERA.equals(str)) {\r

diff --git a/app/version_code.properties b/app/version_code.properties
index 82b5cee..de8702a 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Apr 02 17:10:56 CST 2020\r
-VERSION_CODE=390\r
+#Fri Apr 03 14:26:47 CST 2020\r
+VERSION_CODE=391\r