From 69afac92a320033297d71e901e3c5b65e690f0b2 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期二, 12 十一月 2024 11:42:15 +0800
Subject: [PATCH] 增加knx科技系统温度0.5支持
---
HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLAppliances/HDLAirCondition/AirTechSysBackInfo.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLAppliances/HDLAirCondition/AirTechSysBackInfo.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLAppliances/HDLAirCondition/AirTechSysBackInfo.java
index c6b0aab..ca8446d 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLAppliances/HDLAirCondition/AirTechSysBackInfo.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLAppliances/HDLAirCondition/AirTechSysBackInfo.java
@@ -1,7 +1,5 @@
package com.hdl.sdk.ttl.HDLAppliances.HDLAirCondition;
-import android.util.Log;
-
import com.hdl.sdk.ttl.HDLDeviceManger.Bean.AppliancesInfo;
import java.io.Serializable;
@@ -18,8 +16,19 @@
private String indoorHumidity;//瀹ゅ唴婀垮害 0-100
private int indoorTempInt;//瀹ゅ唴娓╁害鐐规暣鏁伴儴鍒�
private int indoorTempFloat;//瀹ゅ唴娓╁害鐐瑰皬鏁伴儴鍒�
- private int refTemp;//鍒跺喎娓╁害鐐� 0-84
- private int heatTemp;//鍒剁儹娓╁害鐐� 0-84
+
+ private String coldTemp;//鍒跺喎娓╁害鐐�,鏀寔灏忔暟鐨勭敤杩欎釜
+ private int refTemp;//鍒跺喎娓╁害鐐规暣鏁伴儴鍒� 0-84
+ private int refTempFloat;//鍒跺喎娓╁害鐐瑰皬鏁伴儴鍒�
+
+ private String hotTemp;//鍒跺喎娓╁害鐐癸紝鏀寔灏忔暟鐨勭敤杩欎釜
+ private int heatTemp;//鍒剁儹娓╁害鐐规暣鏁伴儴鍒� 0-84
+ private int heatTempFloat;//鍒剁儹娓╁害鐐瑰皬鏁伴儴鍒�
+
+ private String setTemp;//鍒跺喎娓╁害鐐� 0-84
+ private int setTempInt;//鍒剁儹娓╁害鐐规暣鏁伴儴鍒� 0-84
+ private int setTempFloat;//鍒剁儹娓╁害鐐瑰皬鏁伴儴鍒�
+
private int airMode;//绌鸿皟妯″紡0 = 鍒跺喎, 1 = 鍒剁儹
private byte[] curState;//鎺у埗鍥為淇℃伅
@@ -34,7 +43,27 @@
if (this.curState == null) return;
- if (this.curState.length >= 14) {
+ if (this.curState.length >= 19) {
+ this.channelNum = this.curState[0] & 0xFF;
+ this.indoorTempInt = this.curState[2] & 0xFF;
+ this.refTemp = this.curState[3] & 0xFF;//鍒跺喎娓╁害鐐� 0-84
+ this.heatTemp = this.curState[4] & 0xFF;//鍒剁儹娓╁害鐐� 0-84
+ this.isOn = this.curState[8] & 0xFF;//鍙彇浣�4浣�
+ this.airMode = this.curState[9] & 0xFF;
+ this.setTempInt = this.curState[11] & 0xFF;
+ this.indoorTempFloat = this.curState[13] & 0xFF;
+ this.indoorTemp = indoorTempInt + "." + indoorTempFloat;
+
+ this.refTempFloat = this.curState[14] & 0xFF;
+ this.coldTemp = refTemp + "." + refTempFloat;
+
+ this.heatTempFloat = this.curState[15] & 0xFF;
+ this.hotTemp = heatTemp + "." + heatTempFloat;
+
+ this.setTempFloat = this.curState[18] & 0xFF;
+ this.setTemp = setTempInt + "." + setTempFloat;
+
+ } else if (this.curState.length >= 14) {
this.channelNum = this.curState[0] & 0xFF;
this.indoorTempInt = this.curState[2] & 0xFF;
this.refTemp = this.curState[3] & 0xFF;//鍒跺喎娓╁害鐐� 0-84
@@ -118,6 +147,30 @@
this.airMode = airMode;
}
+ public String getColdTemp() {
+ return coldTemp;
+ }
+
+ public void setColdTemp(String coldTemp) {
+ this.coldTemp = coldTemp;
+ }
+
+ public String getHotTemp() {
+ return hotTemp;
+ }
+
+ public void setHotTemp(String hotTemp) {
+ this.hotTemp = hotTemp;
+ }
+
+ public String getSetTemp() {
+ return setTemp;
+ }
+
+ public void setSetTemp(String setTemp) {
+ this.setTemp = setTemp;
+ }
+
public byte[] getCurState() {
return curState;
}
--
Gitblit v1.8.0