From: SnickerSun <scy@incartech.cn>
Date: Mon, 21 Jun 2021 07:39:54 +0000 (+0800)
Subject: release V810
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=b405d1184f3616d4e894d199cee0eb91613a68db;p=protocol_srv.git

release V810
添加 心率，体温非正常值滤除 不上报
---

diff --git a/app/release/ICSer_V810_2106211535_release.apk b/app/release/ICSer_V810_2106211535_release.apk
new file mode 100644
index 00000000..4ed1f039
Binary files /dev/null and b/app/release/ICSer_V810_2106211535_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index fd3f1768..c44f8a78 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":794,"versionName":"2106171839","enabled":true,"outputFile":"ICSer_V794_2106171839_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V794_2106171839_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":810,"versionName":"2106211535","enabled":true,"outputFile":"ICSer_V810_2106211535_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V810_2106211535_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index d0de085c..4c53591c 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -884,9 +884,8 @@ public class Config {
             ConfigAlarm(Runtime.AlarmType.ALARM_LOCK_WATCH, true);
             DefaultLocationMode = CUSTOM_MOD8_GPS;
             DefaultLocationCycle = 10 * 60;
-            DefaultPPGTestCycle = 0;
-            DefaultTemperatureTestCycle = 0;
-
+            DefaultPPGTestCycle = 60 * 60;
+            DefaultTemperatureTestCycle = 60 * 60;
             noPushTxtNotifyDialog = true;
             noSMSNotifyDialog = true;
             noVoiceNotifyDialog = true;
diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
index 4efed98f..9edf97e2 100644
--- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
+++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java
@@ -192,6 +192,10 @@ public class protocolAPIHelper {
                 return null;
             }
         }
+        if(temp_adusted<=0 && body_temp<=0){
+            ICLogger.i("腕温，体温都 <= 0 跳过上传消息 !");
+            return null;
+        }
         StringMessage ret = null;
         switch (Config.protocol_no) {
             case Config.PROTOCOL_JIAI:
@@ -406,6 +410,11 @@ public class protocolAPIHelper {
     public static StringMessage getPPG_ECG_MSG(Runtime runtime) {
         if (is_protocol_not_Initialled()) return null;
         StringMessage ret = null;
+
+        if(runtime==null || runtime.getHRS().getPPG()<=0 ){
+            ICLogger.d(" 心率 值 <=0 跳过异常数据！");
+            return null;
+        }
         switch (Config.protocol_no) {
             case Config.PROTOCOL_JIAI:
                 //ret=protocol_jiai.APHP(runtime);
@@ -433,6 +442,10 @@ public class protocolAPIHelper {
     public static StringMessage getPPG_ECG_MSG(Runtime runtime, int ppg, int bph, int bpl) {
         if (is_protocol_not_Initialled()) return null;
         StringMessage ret = null;
+        if(runtime==null || runtime.getHRS().getPPG()<=0 ){
+            ICLogger.d(" 心率 值 <=0 跳过异常数据！");
+            return null;
+        }
         switch (Config.protocol_no) {
             case Config.PROTOCOL_JIAI:
                 ret = protocol_jiai.APHT(ppg, bph, bpl);
diff --git a/app/version_code.properties b/app/version_code.properties
index d5f39a44..a92f2a03 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Jun 19 18:02:24 CST 2021
-VERSION_CODE=808
+#Mon Jun 21 15:35:03 CST 2021
+VERSION_CODE=810
diff --git a/local.properties b/local.properties
index 310b4c84..618c2104 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Wed Jun 16 20:35:12 CST 2021
-sdk.dir=E\:\\Android\\Sdk
+#Sat Jun 19 18:18:09 CST 2021
+sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk