release V59

修正L56A anan 版本读取温度失效问题

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V59_202105281513_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V59_202105281513_release.apk
new file mode 100644 (file)
index 0000000..94d9c03
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V59_202105281513_release.apk differ

diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index 3af4840..1103358 100644 (file)
--- a/app/IcL02WorkService/release/output.json
+++ b/app/IcL02WorkService/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V58_202105201450_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V58_202105201450_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V59_202105281513_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V59_202105281513_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/work/domain/TemperatureItem.java b/app/src/main/java/com/ic/work/domain/TemperatureItem.java
index a4cdb44..4d8e508 100644 (file)
--- a/app/src/main/java/com/ic/work/domain/TemperatureItem.java
+++ b/app/src/main/java/com/ic/work/domain/TemperatureItem.java
@@ -1,119 +1,131 @@
-package com.ic.work.domain;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class TemperatureItem implements Parcelable {
-
-    private String bodyTemp/*体温*/;
-    private String cpuTemp/*cpu温度*/;
-    private String evnTemp/*环境温度*/;
-    private String gpuTemp/*gpu温度*/;
-    private String chargeTemp/*充电版温度*/;
-    private String boardTemp/*主板温度*/;
-    private String paTemp/*射频的温度*/;
-
-    public TemperatureItem(String bodyTemp, String cpuTemp, String evnTemp, String gpuTemp, String chargeTemp, String boardTemp, String paTemp) {
-        this.bodyTemp = bodyTemp;
-        this.cpuTemp = cpuTemp;
-        this.evnTemp = evnTemp;
-        this.gpuTemp = gpuTemp;
-        this.chargeTemp = chargeTemp;
-        this.boardTemp = boardTemp;
-        this.paTemp = paTemp;
-    }
-
-    protected TemperatureItem(Parcel in) {
-        bodyTemp = in.readString();
-        cpuTemp = in.readString();
-        evnTemp = in.readString();
-        gpuTemp = in.readString();
-        chargeTemp = in.readString();
-        boardTemp = in.readString();
-        paTemp = in.readString();
-    }
-
-    public static final Creator<TemperatureItem> CREATOR = new Creator<TemperatureItem>() {
-        @Override
-        public TemperatureItem createFromParcel(Parcel in) {
-            return new TemperatureItem(in);
-        }
-
-        @Override
-        public TemperatureItem[] newArray(int size) {
-            return new TemperatureItem[size];
-        }
-    };
-
-    public String getBodyTemp() {
-        return bodyTemp;
-    }
-
-    public void setBodyTemp(String bodyTemp) {
-        this.bodyTemp = bodyTemp;
-    }
-
-    public String getCpuTemp() {
-        return cpuTemp;
-    }
-
-    public void setCpuTemp(String cpuTemp) {
-        this.cpuTemp = cpuTemp;
-    }
-
-    public String getEvnTemp() {
-        return evnTemp;
-    }
-
-    public void setEvnTemp(String evnTemp) {
-        this.evnTemp = evnTemp;
-    }
-
-    public String getGpuTemp() {
-        return gpuTemp;
-    }
-
-    public void setGpuTemp(String gpuTemp) {
-        this.gpuTemp = gpuTemp;
-    }
-
-    public String getChargeTemp() {
-        return chargeTemp;
-    }
-
-    public void setChargeTemp(String chargeTemp) {
-        this.chargeTemp = chargeTemp;
-    }
-
-    public String getBoardTemp() {
-        return boardTemp;
-    }
-
-    public void setBoardTemp(String boardTemp) {
-        this.boardTemp = boardTemp;
-    }
-
-    public String getPaTemp() {
-        return paTemp;
-    }
-
-    public void setPaTemp(String paTemp) {
-        this.paTemp = paTemp;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(bodyTemp);
-        dest.writeString(cpuTemp);
-        dest.writeString(evnTemp);
-        dest.writeString(gpuTemp);
-        dest.writeString(chargeTemp);
-        dest.writeString(boardTemp);
-        dest.writeString(paTemp);
-    }
-}
+package com.ic.work.domain;\r
+\r
+import android.os.Parcel;\r
+import android.os.Parcelable;\r
+\r
+public class TemperatureItem implements Parcelable {\r
+\r
+    private String wristTemp/*腕温*/;\r
+    private String bodyTemp/*体温*/;\r
+    private String cpuTemp/*cpu温度*/;\r
+    private String evnTemp/*环境温度*/;\r
+    private String gpuTemp/*gpu温度*/;\r
+    private String chargeTemp/*充电版温度*/;\r
+    private String boardTemp/*主板温度*/;\r
+    private String paTemp/*射频的温度*/;\r
+\r
+    public TemperatureItem(String wristTemp, String bodyTemp, String cpuTemp, String evnTemp, String gpuTemp, String chargeTemp, String boardTemp, String paTemp) {\r
+        this.wristTemp = wristTemp;\r
+        this.bodyTemp = bodyTemp;\r
+        this.cpuTemp = cpuTemp;\r
+        this.evnTemp = evnTemp;\r
+        this.gpuTemp = gpuTemp;\r
+        this.chargeTemp = chargeTemp;\r
+        this.boardTemp = boardTemp;\r
+        this.paTemp = paTemp;\r
+    }\r
+\r
+    public String getWristTemp() {\r
+        return wristTemp;\r
+    }\r
+\r
+    public void setWristTemp(String wristTemp) {\r
+        this.wristTemp = wristTemp;\r
+    }\r
+\r
+    public String getBodyTemp() {\r
+        return bodyTemp;\r
+    }\r
+\r
+    public void setBodyTemp(String bodyTemp) {\r
+        this.bodyTemp = bodyTemp;\r
+    }\r
+\r
+    public String getCpuTemp() {\r
+        return cpuTemp;\r
+    }\r
+\r
+    public void setCpuTemp(String cpuTemp) {\r
+        this.cpuTemp = cpuTemp;\r
+    }\r
+\r
+    public String getEvnTemp() {\r
+        return evnTemp;\r
+    }\r
+\r
+    public void setEvnTemp(String evnTemp) {\r
+        this.evnTemp = evnTemp;\r
+    }\r
+\r
+    public String getGpuTemp() {\r
+        return gpuTemp;\r
+    }\r
+\r
+    public void setGpuTemp(String gpuTemp) {\r
+        this.gpuTemp = gpuTemp;\r
+    }\r
+\r
+    public String getChargeTemp() {\r
+        return chargeTemp;\r
+    }\r
+\r
+    public void setChargeTemp(String chargeTemp) {\r
+        this.chargeTemp = chargeTemp;\r
+    }\r
+\r
+    public String getBoardTemp() {\r
+        return boardTemp;\r
+    }\r
+\r
+    public void setBoardTemp(String boardTemp) {\r
+        this.boardTemp = boardTemp;\r
+    }\r
+\r
+    public String getPaTemp() {\r
+        return paTemp;\r
+    }\r
+\r
+    public void setPaTemp(String paTemp) {\r
+        this.paTemp = paTemp;\r
+    }\r
+\r
+    protected TemperatureItem(Parcel in) {\r
+        wristTemp = in.readString();\r
+        bodyTemp = in.readString();\r
+        cpuTemp = in.readString();\r
+        evnTemp = in.readString();\r
+        gpuTemp = in.readString();\r
+        chargeTemp = in.readString();\r
+        boardTemp = in.readString();\r
+        paTemp = in.readString();\r
+    }\r
+\r
+    @Override\r
+    public void writeToParcel(Parcel dest, int flags) {\r
+        dest.writeString(wristTemp);\r
+        dest.writeString(bodyTemp);\r
+        dest.writeString(cpuTemp);\r
+        dest.writeString(evnTemp);\r
+        dest.writeString(gpuTemp);\r
+        dest.writeString(chargeTemp);\r
+        dest.writeString(boardTemp);\r
+        dest.writeString(paTemp);\r
+    }\r
+\r
+    @Override\r
+    public int describeContents() {\r
+        return 0;\r
+    }\r
+\r
+    public static final Creator<TemperatureItem> CREATOR = new Creator<TemperatureItem>() {\r
+        @Override\r
+        public TemperatureItem createFromParcel(Parcel in) {\r
+            return new TemperatureItem(in);\r
+        }\r
+\r
+        @Override\r
+        public TemperatureItem[] newArray(int size) {\r
+            return new TemperatureItem[size];\r
+        }\r
+    };\r
+}\r

diff --git a/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java b/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
index 2f48050..4030122 100644 (file)
--- a/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
+++ b/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
@@ -68,9 +68,9 @@ public class TemperatureHelper {
                         IcLog.d(TAG, "type is == > IC68");
                         temperatureItem = TemperatureUtil.doTempTest();
                         if (temperatureItem != null) {
-                            lastWristTemp = Double.parseDouble(temperatureItem.getBodyTemp());
+                            lastBodyTemp = Double.parseDouble(temperatureItem.getBodyTemp());
                             lastTempOut = Double.parseDouble(temperatureItem.getEvnTemp());
-                            //TODO:getBodyTemp，环境使用26度.
+                            lastWristTemp = Double.parseDouble(temperatureItem.getWristTemp());
                         }
                     } else {
                         IcLog.d(TAG, "type is == > 7068 = > " + typeOrder);

diff --git a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
index f47f10f..b8dda2b 100644 (file)
--- a/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
+++ b/app/src/main/java/com/ic/work/utils/TemperatureUtil.java
@@ -109,6 +109,7 @@ public class TemperatureUtil {
                     ICLogger.d("bodyTempResult == > " + bodyTempResult);
                     lastBodyTemp = getBodyTemp(bodyTempResult, 26.1f);
                     ICLogger.d("final body temp == > " + lastBodyTemp);
+                    ICLogger.d("final wrist temp == > " + bodyTempResult);
                 }
             } else if ("q3ft".equals(property)) {
                 resultEnvTemp = AlgorithmUtils.s123GetEnvData(evnTemp, boardTemp);
@@ -121,6 +122,17 @@ public class TemperatureUtil {
 
                 IcLog.d(TAG, "evnTemp == > " + evnTemp + " resultEnvTemp = >  " + resultEnvTemp);
                 IcLog.d(TAG, "bodyTemp == > " + bodyTemp + " resultBodyTemp = >  " + lastBodyTemp);
+            } else {
+
+             //   double bodyTempResult = AlgorithmUtils.l004Pt(bodyTemp, evnTemp);
+                ICLogger.d("wrist TempResult == > " + bodyTemp);
+                if (bodyTemp != -1) {
+                    //越接近34.1越准确
+                    lastBodyTemp = getBodyTemp(bodyTemp, 26.1f);
+                    ICLogger.d("final body temp == > " + lastBodyTemp);
+
+                }
+
             }
 
             if (lastBodyTemp <= 0) {
@@ -129,6 +141,7 @@ public class TemperatureUtil {
             try {
                 //发送消息给launcher显示
                 TemperatureItem temperatureItem = new TemperatureItem(
+                        String.format("%.01f", bodyTemp),
                         String.format("%.01f", lastBodyTemp),
                         String.format("%.01f", cpuTemp),
                         String.format("%.01f", resultEnvTemp),

diff --git a/app/version_code.properties b/app/version_code.properties
index 055f6a2..2196c17 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
 #Thu Jul 16 16:46:05 CST 2020
-VERSION_CODE=58
+VERSION_CODE=59