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 3a55c18..0decfc2 100644 (file)
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 be1196f..43f8a6c 100644 (file)
--- 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 091b001..619d63d 100644 (file)
--- 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;\r
   public static boolean SOSNoNeedDial=false;\r
 \r
+  public static boolean disableWristTemp=false;\r
   public static boolean noTempSensor=false;\r
   public static boolean noPPGSensor=false;\r
   public static boolean needBroadcastAntiAlarm=true;\r
   public static boolean disableWiFiScan=false;\r
   static  {\r
     disableWiFiScan=Util.getSystemProperties("persist.sys.disableWiFiLocation","false").equals("true");\r
+    disableWristTemp=Util.getSystemProperties("persist.sys.disableWristTemp","false").equals("true");\r
   }\r
   \r
   private static String make() {\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 bf12b65..ebf56d1 100644 (file)
--- 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);\r
       boolean byprotocol=paramIntent.getBooleanExtra(KEY_TEMP_BYPROTOCOL,false);\r
       if(byprotocol==false) {\r
+        if (Config.disableWristTemp) {\r
+          //ic68\r
+          body_temp=wrist_temp;\r
+        }\r
         ICLogger.i("Received Temperature wrist "+wrist_temp+" body "+body_temp);\r
         StringMessage temperatureMsg = protocolAPIHelper.getTemperatureMSG(wrist_temp, body_temp, tempOut, null);\r
         if (temperatureMsg != null) {\r

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 74f2651..a57f3ca 100644 (file)
--- 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 {
 \r
             if(ICJniUtils.isTemperatureDevAvailable()==ICJniUtils.TempSensorType.TEMPSENSOR_TYPE_IC68.ordinal()){\r
                 //如果是IC68，只有体温，没有腕温\r
-                temout=TemperatureUtil.get_tempOut_value_origin();\r
-                if(temout<0.001f){\r
-                    Util.mSleep(1000);\r
-                    ICLogger.i("retry read tempOut for 0");\r
-                    temout=TemperatureUtil.get_tempOut_value_origin();\r
-                }\r
-\r
-                if(temout>60 || temout<0){\r
-                    temout=0.0f;\r
-                }\r
-                if(temout>0.001f){\r
-                    body_temp = TemperatureUtil.getBodyTemp(wrist_temp, temout);\r
-                }else{\r
-                    body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);\r
+                if (Config.disableWristTemp) {\r
+                    body_temp=wrist_temp;\r
+                }else {\r
+                    temout = TemperatureUtil.get_tempOut_value_origin();\r
+                    if (temout < 0.001f) {\r
+                        Util.mSleep(1000);\r
+                        ICLogger.i("retry read tempOut for 0");\r
+                        temout = TemperatureUtil.get_tempOut_value_origin();\r
+                    }\r
+                    if (temout > 60 || temout < 0) {\r
+                        temout = 0.0f;\r
+                    }\r
+                    if (temout > 0.001f) {\r
+                        body_temp = TemperatureUtil.getBodyTemp(wrist_temp, temout);\r
+                    } else {\r
+                        body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);\r
+                    }\r
                 }\r
             }else {\r
                 body_temp = TemperatureUtil.getBodyTemp(wrist_temp, 26.0f);\r

diff --git a/app/version_code.properties b/app/version_code.properties
index e7c88a3..b45d51b 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Oct 28 10:30:12 CST 2020\r
-VERSION_CODE=681\r
+#Wed Oct 28 16:32:43 CST 2020\r
+VERSION_CODE=682\r