refactor vibrator codes.

diff --git a/app/release/ICSer_V933_2108312051_release.apk b/app/release/ICSer_V934_2109011157_release.apk
similarity index 77%
rename from app/release/ICSer_V933_2108312051_release.apk
rename to app/release/ICSer_V934_2109011157_release.apk
index ce2b84f..53e6a3d 100644 (file)
Binary files a/app/release/ICSer_V933_2108312051_release.apk and b/app/release/ICSer_V934_2109011157_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 977ca3a..5f9e35f 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":933,"versionName":"2108312051","enabled":true,"outputFile":"ICSer_V933_2108312051_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V933_2108312051_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":934,"versionName":"2109011157","enabled":true,"outputFile":"ICSer_V934_2109011157_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V934_2109011157_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java b/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java
index 01e6893..c32acc5 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/SleepInfo.java
@@ -66,7 +66,6 @@ public class SleepInfo {
      * @ sleepend
      * 系统设置的 睡眠停止监测时间 例如第二天早9点
      */
-
     public SleepInfo() {
         currentDate = TimeUtil.getSystemDateYYMMDD();
     }
@@ -78,10 +77,15 @@ public class SleepInfo {
             int i;
             for (i = 0; i < turnovertimesArray.size(); i++) {
                 if (i > 0) {
-                    turnOverTime += (turnovertimesArray.get(i).stepCount - turnovertimesArray.get(i - 1).stepCount);
+                    turnOverTime += (turnovertimesArray.get(i).stepCount
+                            - turnovertimesArray.get(i - 1).stepCount);
                 }
             }
         }
+        //不可能为负数的
+        if (turnOverTime < 0) {
+            turnOverTime = 0;
+        }
         return turnOverTime;
     }
 

diff --git a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
index 2975e30..b0c7685 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java
@@ -53,7 +53,7 @@ public class VibrateUtil {
 \r
     boolean isVibrate = false;\r
 \r
-    public void vibrateOn(boolean on) {\r
+    public synchronized void vibrateOn(boolean on) {\r
         if (isVibrate) {\r
             return;\r
         }\r
@@ -63,15 +63,23 @@ public class VibrateUtil {
                 //一秒钟后置成false\r
                 handler.postDelayed(() -> {\r
                     isVibrate = false;\r
+                    vibrator.cancel();\r
                     ICLogger.d("vibrate finish...");\r
                 }, 1300);\r
-                vibrator.vibrate(1000);//不循环\r
+                handler.removeCallbacks(vibrateTask);\r
+                handler.post(vibrateTask);\r
             } else {\r
-                vibrator.cancel();\r
+                handler.post(() -> {\r
+                    vibrator.cancel();\r
+                });\r
             }\r
         }\r
     }\r
 \r
+    private final Runnable vibrateTask = () -> {\r
+        vibrator.vibrate(1000);//不循环\r
+    };\r
+\r
     public void VibrateOnOnce(boolean on) {\r
         if (patter_item > 0) {\r
             if (vibrator != null) {\r