From: snickersun <scy@incartech.cn>
Date: Sun, 29 Nov 2020 00:28:37 +0000 (+0800)
Subject: release L02protocolV2 V718
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=e090c0a9d0ce3bae1efba58b2772cdb72df8ab0c;p=protocol_srv.git

release L02protocolV2 V718
测量体温时如果不是生产测试，则关闭重力计，避免读取重力加速度造成温度读取错误。
---

diff --git a/app/release/ICSer_V717_2011290053_release.apk b/app/release/ICSer_V718_2011290637_release.apk
similarity index 78%
rename from app/release/ICSer_V717_2011290053_release.apk
rename to app/release/ICSer_V718_2011290637_release.apk
index 3be90def..e58d7ebf 100644
Binary files a/app/release/ICSer_V717_2011290053_release.apk and b/app/release/ICSer_V718_2011290637_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index e2081b6c..e81ce3e8 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":717,"versionName":"2011290053","enabled":true,"outputFile":"ICSer_V717_2011290053_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V717_2011290053_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":718,"versionName":"2011290637","enabled":true,"outputFile":"ICSer_V718_2011290637_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V718_2011290637_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 9c7432a6..d0222eb7 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TemperatureUtil.java
@@ -84,9 +84,13 @@ public class TemperatureUtil {
                 ICLogger.i("未佩戴，取消TempTest！");
                 return;
             }
-        }
+        }else
+            return;
         if (ICJniUtils.isTemperatureDevAvailable() >ICJniUtils.TempSensorType.TEMPSENSOR_TYPE_NONE.ordinal()) {
 
+            if(!DeviceInfoUtil.isFactoryTestTopActivity(CoreService.getInstance())){
+                ICJniUtils.disablePedometer();
+            }
             ICJniUtils.enableTemperature();
             Util.mSleep(1000);
 
@@ -139,6 +143,7 @@ public class TemperatureUtil {
             sendTempBroadcast(wrist_temp,body_temp,temout);
 
             ICJniUtils.disableTemperature();
+            ICJniUtils.enablePedometer();
 
             //体温异常报警检测开启的会进行异常报警
             if (Config.needTemperature_abnormal_alarm) {
diff --git a/app/version_code.properties b/app/version_code.properties
index 49cb6a7c..ba028fe7 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sun Nov 29 00:53:27 CST 2020
-VERSION_CODE=717
+#Sun Nov 29 06:37:00 CST 2020
+VERSION_CODE=718