From f9d01e2084e5b53840b09f557b4e2c700c790d80 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 24 六月 2020 10:51:23 +0800
Subject: [PATCH] 2020-06-24 1.增加干节点指令处理。 （干节点0 移动传感器1 煤气传感器10 烟雾传感器11 水浸25 门磁窗磁26 紧急按钮27）
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
index f3a4b01..957b70e 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/GeothermalActivity.java
@@ -141,6 +141,7 @@
}
+
}
});
@@ -150,7 +151,7 @@
public void onClick(View view) {
String tempStr = tempEditText.getText().toString();
- if (TextUtils.isEmpty(tempStr) || TextUtils.isEmpty(tempStr)) {
+ if (TextUtils.isEmpty(tempStr)) {
showToast("璁剧疆鐨勬俯搴︿笉鑳戒负绌�");
return;
}
@@ -161,27 +162,14 @@
return;
}
proDialog.show();
- switch (gModeState) {
+// HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//鑷姩鏍规嵁褰撳墠妯″紡璁剧疆褰撳墠妯″紡鐨勬俯搴︺��
+ switch (gModeState) {
case 1:
- //褰撳墠鍦扮儹妯″紡涓烘櫘閫�
- HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gNormalTemp, tempInt);//鏅�氭俯搴�
- ctrlId = GeothermalParser.gNormalTemp;
- break;
case 2:
- //褰撳墠鍦扮儹妯″紡涓虹櫧澶�
- HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gDayTemp, tempInt);//鐧藉ぉ娓╁害
- ctrlId = GeothermalParser.gDayTemp;
- break;
case 3:
- //褰撳墠鍦扮儹妯″紡涓哄闂�
- HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gNightTemp, tempInt);//澶滈棿娓╁害
- ctrlId = GeothermalParser.gNightTemp;
- break;
case 4:
- //褰撳墠鍦扮儹妯″紡涓虹寮�
- HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gLeaveTemp, tempInt);//绂诲紑娓╁害
- ctrlId = GeothermalParser.gLeaveTemp;
+ HDLCommand.geothermalCtrlTemp(appliancesInfo, tempInt);//鑷姩鏍规嵁褰撳墠妯″紡璁剧疆褰撳墠妯″紡鐨勬俯搴︺��
break;
case 5:
proDialog.dismiss();
@@ -196,6 +184,41 @@
}
+// switch (gModeState) {
+//
+// case 1:
+// //褰撳墠鍦扮儹妯″紡涓烘櫘閫�
+// HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gNormalTemp, tempInt);//鏅�氭俯搴�
+// ctrlId = GeothermalParser.gNormalTemp;
+// break;
+// case 2:
+// //褰撳墠鍦扮儹妯″紡涓虹櫧澶�
+// HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gDayTemp, tempInt);//鐧藉ぉ娓╁害
+// ctrlId = GeothermalParser.gDayTemp;
+// break;
+// case 3:
+// //褰撳墠鍦扮儹妯″紡涓哄闂�
+// HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gNightTemp, tempInt);//澶滈棿娓╁害
+// ctrlId = GeothermalParser.gNightTemp;
+// break;
+// case 4:
+// //褰撳墠鍦扮儹妯″紡涓虹寮�
+// HDLCommand.geothermalCtrl(appliancesInfo, GeothermalParser.gLeaveTemp, tempInt);//绂诲紑娓╁害
+// ctrlId = GeothermalParser.gLeaveTemp;
+// break;
+// case 5:
+// proDialog.dismiss();
+// //褰撳墠鍦扮儹妯″紡涓鸿嚜鍔�
+// showToast("鑷姩妯″紡锛屼笉鑳芥帶鍒舵俯搴�");
+// break;
+// default:
+// proDialog.dismiss();
+// //褰撳墠鍦扮儹妯″紡涓鸿嚜鍔�
+// showToast("鏈煡妯″紡锛屼笉鑳芥帶鍒舵俯搴�");
+// break;
+//
+// }
+
}
});
--
Gitblit v1.8.0