From: SnickerSun Date: Fri, 28 May 2021 07:14:23 +0000 (+0800) Subject: release V59 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=4d41f84bbe3ea4a7f5d1a0257dc82bd26bfcf496;p=icworkservice.git 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 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 --- 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 --- 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 CREATOR = new Creator() { - @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; + +import android.os.Parcel; +import android.os.Parcelable; + +public class TemperatureItem implements Parcelable { + + private String wristTemp/*腕温*/; + 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 wristTemp, String bodyTemp, String cpuTemp, String evnTemp, String gpuTemp, String chargeTemp, String boardTemp, String paTemp) { + this.wristTemp = wristTemp; + this.bodyTemp = bodyTemp; + this.cpuTemp = cpuTemp; + this.evnTemp = evnTemp; + this.gpuTemp = gpuTemp; + this.chargeTemp = chargeTemp; + this.boardTemp = boardTemp; + this.paTemp = paTemp; + } + + public String getWristTemp() { + return wristTemp; + } + + public void setWristTemp(String wristTemp) { + this.wristTemp = wristTemp; + } + + 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; + } + + protected TemperatureItem(Parcel in) { + wristTemp = in.readString(); + bodyTemp = in.readString(); + cpuTemp = in.readString(); + evnTemp = in.readString(); + gpuTemp = in.readString(); + chargeTemp = in.readString(); + boardTemp = in.readString(); + paTemp = in.readString(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(wristTemp); + dest.writeString(bodyTemp); + dest.writeString(cpuTemp); + dest.writeString(evnTemp); + dest.writeString(gpuTemp); + dest.writeString(chargeTemp); + dest.writeString(boardTemp); + dest.writeString(paTemp); + } + + @Override + public int describeContents() { + return 0; + } + + public static final Creator CREATOR = new Creator() { + @Override + public TemperatureItem createFromParcel(Parcel in) { + return new TemperatureItem(in); + } + + @Override + public TemperatureItem[] newArray(int size) { + return new TemperatureItem[size]; + } + }; +} 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 --- 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 --- 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 --- 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