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支持
---
app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlAirKNXTechSysActivity.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlAirKNXTechSysActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlAirKNXTechSysActivity.java
index be0c4b1..813a698 100644
--- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlAirKNXTechSysActivity.java
+++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlAirKNXTechSysActivity.java
@@ -138,9 +138,10 @@
showToast("璁剧疆鐨勬俯搴︿笉鑳戒负绌�");
return;
}
- int tempInt = Integer.parseInt(tempStr);
+ //2024.5.30淇敼锛屾俯搴︿慨鏀逛负娴偣鍨�
+ Float temp = Float.parseFloat(tempStr);
- if (tempInt < 5 || tempInt > 35) {
+ if (temp < 5 || temp > 35) {
showToast("娓╁害璁剧疆鑼冨洿涓猴細5~35鎽勬皬搴�(鈩�)");
return;
}
@@ -148,11 +149,11 @@
switch (airModeState) {
case 0:
//褰撳墠绌鸿皟妯″紡涓哄埗鍐�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.refTem, tempInt);//鍒跺喎娓╁害
+ HDLCommand.airCtrlTemp(appliancesInfo, AirCtrlParser.refTem, temp);//鍒跺喎娓╁害锛�2024.5.30淇敼锛屾俯搴︽帶鍒惰皟鐢╝irCtrlTemp鏂规硶
break;
case 1:
//褰撳墠绌鸿皟妯″紡涓哄埗鐑�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.heatTem, tempInt);//鍒剁儹娓╁害
+ HDLCommand.airCtrlTemp(appliancesInfo, AirCtrlParser.heatTem, temp);//鍒剁儹娓╁害锛�2024.5.30淇敼锛屾俯搴︽帶鍒惰皟鐢╝irCtrlTemp鏂规硶
break;
}
}
@@ -173,9 +174,13 @@
stringState += "\n瀹ゅ唴娓╁害锛�" + mAirTechSysBackInfo.getIndoorTemp();
if (AirCtrlParser.airModeRefTem == mAirTechSysBackInfo.getAirMode()) {
- stringState += "\n鍒跺喎妯″紡娓╁害锛�" + mAirTechSysBackInfo.getRefTemp();
+ stringState += "\n鍒跺喎妯″紡娓╁害锛�" + mAirTechSysBackInfo.getColdTemp();//2024.5.30鏇存柊
} else if (AirCtrlParser.airModeHeatTem == mAirTechSysBackInfo.getAirMode()) {
- stringState += "\n鍒剁儹妯″紡娓╁害锛�" + mAirTechSysBackInfo.getHeatTemp();
+ stringState += "\n鍒剁儹妯″紡娓╁害锛�" + mAirTechSysBackInfo.getHotTemp();//2024.5.30鏇存柊
+ }
+
+ if (!TextUtils.isEmpty(mAirTechSysBackInfo.getSetTemp())){//2024.5.30鏇存柊
+ stringState += "\n璁剧疆娓╁害锛�" + mAirTechSysBackInfo.getSetTemp();
}
} else {
@@ -244,9 +249,13 @@
message += "\n瀹ゅ唴娓╁害锛�" + mAirTechSysBackInfo.getIndoorTemp();
if (AirCtrlParser.airModeRefTem == mAirTechSysBackInfo.getAirMode()) {
- message += "\n鍒跺喎妯″紡娓╁害锛�" + mAirTechSysBackInfo.getRefTemp();
+ message += "\n鍒跺喎妯″紡娓╁害锛�" + mAirTechSysBackInfo.getColdTemp();//2024.5.30鏇存柊
} else if (AirCtrlParser.airModeHeatTem == mAirTechSysBackInfo.getAirMode()) {
- message += "\n鍒剁儹妯″紡娓╁害锛�" + mAirTechSysBackInfo.getHeatTemp();
+ message += "\n鍒剁儹妯″紡娓╁害锛�" + mAirTechSysBackInfo.getHotTemp();//2024.5.30鏇存柊
+ }
+
+ if (!TextUtils.isEmpty(mAirTechSysBackInfo.getSetTemp())){//2024.5.30鏇存柊
+ message += "\n璁剧疆娓╁害锛�" + mAirTechSysBackInfo.getSetTemp();
}
} else {
@@ -276,7 +285,7 @@
}
AirTechSysBackInfo mAirTechSysBackInfo = event.getAirTechSysBackInfo();
showAirTechSysBackInfo(mAirTechSysBackInfo);
- if (!TextUtils.isEmpty(mAirTechSysBackInfo.getIndoorHumidity())){
+ if (!TextUtils.isEmpty(mAirTechSysBackInfo.getIndoorHumidity())) {
airHumidity.setText("瀹ゅ唴婀垮害锛�" + mAirTechSysBackInfo.getIndoorHumidity());
}
}
--
Gitblit v1.8.0