From: kfl_614 <kfl_614@163.com>
Date: Thu, 17 Dec 2020 09:43:28 +0000 (+0800)
Subject: optimize temperature data.
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=076ebc55985c9f2ee8ac9be96170947f9e48c62f;p=protocol_srv.git

optimize temperature data.
---

diff --git a/app/release/ICSer_V733_2012161928_release.apk b/app/release/ICSer_V736_2012171741_release.apk
similarity index 78%
rename from app/release/ICSer_V733_2012161928_release.apk
rename to app/release/ICSer_V736_2012171741_release.apk
index 393aa31b..16582b53 100644
Binary files a/app/release/ICSer_V733_2012161928_release.apk and b/app/release/ICSer_V736_2012171741_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index df933fbf..91b21e1a 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":733,"versionName":"2012161928","enabled":true,"outputFile":"ICSer_V733_2012161928_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V733_2012161928_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":736,"versionName":"2012171741","enabled":true,"outputFile":"ICSer_V736_2012171741_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V736_2012171741_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java
index 5ede2429..c0eabd0e 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java
@@ -49,7 +49,6 @@ public class TempAlgUtil {
         }
     }
 
-
     //thermal_zone0
     public static final String CMD_CPU_TEM = "/sys/class/thermal/thermal_zone0/temp";
     public static final String CMD_CPU_TYPE = "/sys/class/thermal/thermal_zone0/type";
@@ -135,12 +134,12 @@ public class TempAlgUtil {
             String envDy = Util.getSystemProperties("persist.sys.envAlgDy", "");
             ICLogger.d("envSlope == > " + envSlope + " envDy == >  " + envDy);
             double resultEnvTemp = evnTemp;
-            if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope)) {
+            if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope) && boardTemp > 45) {
                 //进行换算
                 ICLogger.d("env temp with board temp...");
                 resultEnvTemp = evnTemp - (Float.parseFloat(envSlope) * boardTemp + Float.parseFloat(envDy));
-            } else if (boardTemp <= 38 && boardTemp >= 32) {
-                IcLog.d(TAG, "in range of 32 to 38");
+            } else if (boardTemp <= 45 && boardTemp >= 32) {
+                ICLogger.d("in range of 32 to 38");
                 //Ut = St-(Bt*0.869-27.167) Bt∈[32，38)
                 resultEnvTemp = evnTemp - (0.869 * boardTemp - 27.167);
             } else {
@@ -162,6 +161,7 @@ public class TempAlgUtil {
             if (resultBodyTemp < 0) {
                 return null;
             }
+
             try {
                 //发送消息给launcher显示
                 TemperatureItem temperatureItem = new TemperatureItem(
diff --git a/app/version_code.properties b/app/version_code.properties
index 0ad84f71..48f2a036 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Dec 16 19:28:36 CST 2020
-VERSION_CODE=733
+#Thu Dec 17 17:41:27 CST 2020
+VERSION_CODE=736