From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 26 Oct 2021 06:21:06 +0000 (+0800)
Subject: 添加多次上传的过滤
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=1ff9d38548377af1869a908132ded2a474d5b67e;p=icsupport.git

添加多次上传的过滤
---

diff --git a/app/release/ICSer_V994_2110260944_release.apk b/app/release/ICSer_V997_2110261159_release.apk
similarity index 77%
rename from app/release/ICSer_V994_2110260944_release.apk
rename to app/release/ICSer_V997_2110261159_release.apk
index e2886cd1..6cea9510 100644
Binary files a/app/release/ICSer_V994_2110260944_release.apk and b/app/release/ICSer_V997_2110261159_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 9266415e..06769911 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":994,"versionName":"2110260944","enabled":true,"outputFile":"ICSer_V994_2110260944_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V994_2110260944_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":997,"versionName":"2110261159","enabled":true,"outputFile":"ICSer_V997_2110261159_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V997_2110261159_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
index 81448d92..eadab3cd 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -87,6 +87,7 @@ public class TemperatureUtil {
     }
 
     private long lastSendTime = 0;
+    private Temperature lastTemperature;
 
     private final ITempSensorCallback.Stub mRemoteCallback = new ITempSensorCallback.Stub() {
         @Override
@@ -98,8 +99,10 @@ public class TemperatureUtil {
         public void onTemperatureGet(Temperature temperature) {
             ICLogger.d("onTemperatureGet ==> " + temperature);
             long currentTime = System.currentTimeMillis();
-            //30秒内有多次发送，则不在发送了
-            if (lastSendTime != 0 && currentTime - lastSendTime < 30 * 1000) {
+            boolean isSame = checkLastTemperature(lastTemperature, temperature);
+            //120秒内有多次发送，则不在发送了
+            if (lastSendTime != 0
+                    && currentTime - lastSendTime < 2 * 60 * 1000 || isSame) {
                 ICLogger.d("onTemperatureGet too frequent...");
                 return;
             }
@@ -131,6 +134,18 @@ public class TemperatureUtil {
         }
     };
 
+    private boolean checkLastTemperature(Temperature lastTemperature, Temperature temperature) {
+        if (lastTemperature == null) {
+            this.lastTemperature = temperature;
+            return false;
+        }
+        boolean envSame = lastTemperature.getEnvTemp() == temperature.getEnvTemp();
+        boolean bodySame = lastTemperature.getBodyTemp() == temperature.getBodyTemp();
+        boolean wristSame = lastTemperature.getWristTemp() == temperature.getWristTemp();
+        this.lastTemperature = temperature;
+        return envSame && bodySame && wristSame;
+    }
+
     private void handleTemperature(Temperature temperature) {
         ICLogger.i("Temperature done!" + temperature);
         if (temperature == null) {
diff --git a/app/version_code.properties b/app/version_code.properties
index 7863a0a0..e8ca4b2a 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Oct 26 09:44:17 CST 2021
-VERSION_CODE=994
+#Tue Oct 26 11:59:28 CST 2021
+VERSION_CODE=997