From: snickersun <scy@incartech.cn>
Date: Wed, 28 Oct 2020 08:35:48 +0000 (+0800)
Subject: release V682
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=dda6902cef51c31c5d1c9fd2bb8d9f203469f375;p=protocol_srv.git

release V682
添加 disableWristTemp的配置，解决ic68的不同取值问题。
---

diff --git a/app/release/ICSer_V681_2010281030_release.apk b/app/release/ICSer_V682_2010281632_release.apk
similarity index 78%
rename from app/release/ICSer_V681_2010281030_release.apk
rename to app/release/ICSer_V682_2010281632_release.apk
index 3a55c186..0decfc23 100644
Binary files a/app/release/ICSer_V681_2010281030_release.apk and b/app/release/ICSer_V682_2010281632_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index be1196fd..43f8a6c1 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":681,"versionName":"2010281030","enabled":true,"outputFile":"ICSer_V681_2010281030_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V681_2010281030_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":682,"versionName":"2010281632","enabled":true,"outputFile":"ICSer_V682_2010281632_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V682_2010281632_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 091b001d..619d63d4 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -52,12 +52,14 @@ public class Config {
   public static boolean noVoiceNotifyDialog=false;
   public static boolean SOSNoNeedDial=false;
 
+  public static boolean disableWristTemp=false;
   public static boolean noTempSensor=false;
   public static boolean noPPGSensor=false;
   public static boolean needBroadcastAntiAlarm=true;
   public static boolean disableWiFiScan=false;
   static  {
     disableWiFiScan=Util.getSystemProperties("persist.sys.disableWiFiLocation","false").equals("true");
+    disableWristTemp=Util.getSystemProperties("persist.sys.disableWristTemp","false").equals("true");
   }
   
   private static String make() {
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 bf12b65c..ebf56d10 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -428,6 +428,10 @@ public class ProcessReceiver extends BroadcastReceiver {
       double tempOut = paramIntent.getDoubleExtra(KEY_TEMP_OUT, 0.0f);
       boolean byprotocol=paramIntent.getBooleanExtra(KEY_TEMP_BYPROTOCOL,false);
       if(byprotocol==false) {
+        if (Config.disableWristTemp) {
+          //ic68
+          body_temp=wrist_temp;
+        }
         ICLogger.i("Received Temperature wrist "+wrist_temp+" body "+body_temp);
         StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp, tempOut, null);
         if (temperatureMsg != null) {
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 74f26518..a57f3caf 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -95,20 +95,23 @@ public class TemperatureUtil {
 
             if(ICJniUtils.isTemperatureDevAvailable()==ICJniUtils.TempSensorType.TEMPSENSOR_TYPE_IC68.ordinal()){
                 //如果是IC68，只有体温，没有腕温
-                temout=TemperatureUtil.get_tempOut_value_origin();
-                if(temout<0.001f){
-                    Util.mSleep(1000);
-                    ICLogger.i("retry read tempOut for 0");
-                    temout=TemperatureUtil.get_tempOut_value_origin();
-                }
-
-                if(temout>60 || temout<0){
-                    temout=0.0f;
-                }
-                if(temout>0.001f){
-                    body_temp = TemperatureUtil.getBodyTemp(wrist_temp, temout);
-                }else{
-                    body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);
+                if (Config.disableWristTemp) {
+                    body_temp=wrist_temp;
+                }else {
+                    temout = TemperatureUtil.get_tempOut_value_origin();
+                    if (temout < 0.001f) {
+                        Util.mSleep(1000);
+                        ICLogger.i("retry read tempOut for 0");
+                        temout = TemperatureUtil.get_tempOut_value_origin();
+                    }
+                    if (temout > 60 || temout < 0) {
+                        temout = 0.0f;
+                    }
+                    if (temout > 0.001f) {
+                        body_temp = TemperatureUtil.getBodyTemp(wrist_temp, temout);
+                    } else {
+                        body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);
+                    }
                 }
             }else {
                 body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);
diff --git a/app/version_code.properties b/app/version_code.properties
index e7c88a35..b45d51b3 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Oct 28 10:30:12 CST 2020
-VERSION_CODE=681
+#Wed Oct 28 16:32:43 CST 2020
+VERSION_CODE=682