From 70658288824174b5ecd8a022ecfc053a19aa292d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 八月 2021 16:36:14 +0800
Subject: [PATCH] 2021-08-10 1.更新
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirHVACActivity.java | 131 ++++++++++++++++++++-----------------------
1 files changed, 62 insertions(+), 69 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirHVACActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirHVACActivity.java
index a4ce08d..7b31ec0 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirHVACActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirHVACActivity.java
@@ -78,7 +78,6 @@
}
-
/**
* 鍒濆鍖朤oolbar
*/
@@ -99,7 +98,6 @@
String titleStr = appliancesInfo.getRemarks();
}
-
private void initView() {
@@ -163,73 +161,71 @@
airBtnSpeed.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.airCtrl(appliancesInfo,AirCtrlParser.downTem,1);//涓婂崌娓╁害 鑼冨洿0-5
- return;
-// switch (airSpeedState) {
-// case 0:
-// //鑻ュ綋鍓嶇┖璋冮閫熶负鑷姩锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓洪珮椋�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedHigh);//椋庨�熼珮椋�
-// break;
-// case 1:
-// //鑻ュ綋鍓嶇┖璋冮閫熶负楂橀锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓轰腑椋�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedMid);//椋庨�熶腑椋�
-// break;
-// case 2:
-// //鑻ュ綋鍓嶇┖璋冮閫熶负涓锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓轰綆椋�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedLow);//椋庨�熶綆椋�
-// break;
-// case 3:
-// //鑻ュ綋鍓嶇┖璋冮閫熶负浣庨锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓鸿嚜鍔�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedAuto);//椋庨�熻嚜鍔�
-// break;
-//
-//
-// }
+
+ switch (airSpeedState) {
+ case 0:
+ //鑻ュ綋鍓嶇┖璋冮閫熶负鑷姩锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓洪珮椋�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedHigh);//椋庨�熼珮椋�
+ break;
+ case 1:
+ //鑻ュ綋鍓嶇┖璋冮閫熶负楂橀锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓轰腑椋�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedMid);//椋庨�熶腑椋�
+ break;
+ case 2:
+ //鑻ュ綋鍓嶇┖璋冮閫熶负涓锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓轰綆椋�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedLow);//椋庨�熶綆椋�
+ break;
+ case 3:
+ //鑻ュ綋鍓嶇┖璋冮閫熶负浣庨锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓鸿嚜鍔�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedAuto);//椋庨�熻嚜鍔�
+ break;
+
+
+ }
}
});
airBtnTemp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.airCtrl(appliancesInfo,AirCtrlParser.upTem,1);//涓婂崌娓╁害 鑼冨洿0-5
- return;
-// String tempStr = airTempEd.getText().toString();
-// if (TextUtils.isEmpty(tempStr)) {
-// showToast("璁剧疆鐨勬俯搴︿笉鑳戒负绌�");
-// return;
-// }
-// int tempInt = Integer.parseInt(tempStr);
-//
-// if (tempInt < 16 || tempInt > 30) {
-// showToast("娓╁害璁剧疆鑼冨洿涓猴細16~30鎽勬皬搴�(鈩�)");
-// return;
-// }
-//
-// switch (airModeState) {
-// case 0:
-// //褰撳墠绌鸿皟妯″紡涓哄埗鍐�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.refTem, tempInt);//鍒跺喎娓╁害
-// break;
-// case 1:
-// //褰撳墠绌鸿皟妯″紡涓哄埗鐑�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.heatTem, tempInt);//鍒剁儹娓╁害
-// break;
-// case 2:
-// //褰撳墠绌鸿皟妯″紡涓洪�氶
-// showToast("閫氶妯″紡涓嶈兘鎺у埗娓╁害");
-// break;
-// case 3:
-// //褰撳墠绌鸿皟妯″紡涓鸿嚜鍔�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.autoTem, tempInt);//鑷姩娓╁害 鑼冨洿16-30
-// break;
-// case 4:
-// //褰撳墠绌鸿皟妯″紡涓烘娊婀�
-// HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.dehumTem, tempInt);//鎶芥箍娓╁害 鑼冨洿16-30
-// break;
-// default:
-// break;
-//
-// }
+
+ String tempStr = airTempEd.getText().toString();
+ if (TextUtils.isEmpty(tempStr)) {
+ showToast("璁剧疆鐨勬俯搴︿笉鑳戒负绌�");
+ return;
+ }
+ int tempInt = Integer.parseInt(tempStr);
+
+ if (tempInt < 16 || tempInt > 30) {
+ showToast("娓╁害璁剧疆鑼冨洿涓猴細16~30鎽勬皬搴�(鈩�)");
+ return;
+ }
+
+ switch (airModeState) {
+ case 0:
+ //褰撳墠绌鸿皟妯″紡涓哄埗鍐�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.refTem, tempInt);//鍒跺喎娓╁害
+ break;
+ case 1:
+ //褰撳墠绌鸿皟妯″紡涓哄埗鐑�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.heatTem, tempInt);//鍒剁儹娓╁害
+ break;
+ case 2:
+ //褰撳墠绌鸿皟妯″紡涓洪�氶
+ showToast("閫氶妯″紡涓嶈兘鎺у埗娓╁害");
+ break;
+ case 3:
+ //褰撳墠绌鸿皟妯″紡涓鸿嚜鍔�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.autoTem, tempInt);//鑷姩娓╁害 鑼冨洿16-30
+ break;
+ case 4:
+ //褰撳墠绌鸿皟妯″紡涓烘娊婀�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.dehumTem, tempInt);//鎶芥箍娓╁害 鑼冨洿16-30
+ break;
+ default:
+ break;
+
+ }
// HDLCommand.airCtrl(appliancesInfo,AirCtrlParser.upTem,1);//涓婂崌娓╁害 鑼冨洿0-5
// HDLCommand.airCtrl(appliancesInfo,AirCtrlParser.downTem,1);//涓嬮檷娓╁害 鑼冨洿0-5
@@ -354,9 +350,9 @@
}
- private void showAirHVACBackInfo(AirHVACBackInfo mAirHVACBackInfo){
+ private void showAirHVACBackInfo(AirHVACBackInfo mAirHVACBackInfo) {
String message = "";
- if(mAirHVACBackInfo.getIsOn() == AirCtrlParser.airOn) {
+ if (mAirHVACBackInfo.getIsOn() == AirCtrlParser.airOn) {
message = getSwichStateString(mAirHVACBackInfo.getIsOn());
message += "\n" + getModeStateString(mAirHVACBackInfo.getAirMode());//妯″紡
message += "\n" + getSpeedStateString(mAirHVACBackInfo.getAirSpeed());//椋庨��
@@ -365,7 +361,7 @@
message += "\n鍒剁儹妯″紡娓╁害锛�" + mAirHVACBackInfo.getHeatTemp();
message += "\n鑷姩妯″紡娓╁害锛�" + mAirHVACBackInfo.getAutoTemp();
message += "\n鎶芥箍妯″紡娓╁害锛�" + mAirHVACBackInfo.getWettedTemp();
- }else {
+ } else {
message = getSwichStateString(mAirHVACBackInfo.getIsOn());
}
airText.setText(message);
@@ -373,8 +369,6 @@
HDLLog.I(message);
}
-
-
/**
@@ -431,7 +425,6 @@
}
}
}
-
}
--
Gitblit v1.8.0