From 566ddb2ea03e2514de50f2ca861a2674f6e840ac Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期一, 27 十一月 2023 13:32:27 +0800
Subject: [PATCH] 新增科技系统、门锁、新风和地暖支持
---
app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java
index 134416a..3e2a09d 100644
--- a/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java
+++ b/app/src/main/java/com/hdl/sdk/ttl_sdk/activity/CtrlActivity.java
@@ -34,7 +34,7 @@
private RelativeLayout topBarBack;
private TextView topBarTitle;
private Button lightBtn, curtainBtn, curtainBtn2, curtainBtn3, curtainBtn4, curtainBtn5,
- logicBtn, airBtnSwitch, airBtnMode, airBtnTemp, airBtnSpeed, sensorBtn;
+ logicBtn, airBtnSwitch, airBtnMode, airBtnTemp, airBtnSpeed;
private TextView lightText, curText1, curText2, airText, logicText, sensorText;
private EditText airTempEd;
private LinearLayout airDisplay;
@@ -95,7 +95,6 @@
curtainBtn4 = findViewById(R.id.curtainbtn4);
curtainBtn5 = findViewById(R.id.curtainbtn5);
logicBtn = findViewById(R.id.logicbtn);
- sensorBtn = findViewById(R.id.sensorbtn);
airDisplay = findViewById(R.id.air);
airBtnSwitch = findViewById(R.id.airbtn_switch);
@@ -143,7 +142,6 @@
airText.setVisibility(View.GONE);
logicText.setVisibility(View.GONE);
- sensorBtn.setVisibility(View.GONE);
sensorText.setVisibility(View.GONE);
@@ -174,7 +172,6 @@
lightText.setVisibility(View.GONE);
airText.setVisibility(View.GONE);
logicText.setVisibility(View.GONE);
- sensorBtn.setVisibility(View.GONE);
sensorText.setVisibility(View.GONE);
if (appliancesInfo.getDeviceType() == HDLApConfig.TYPE_CURTAIN_MODULE) {
//绐楀笜妯″潡
@@ -229,6 +226,7 @@
break;
case HDLApConfig.TYPE_AC_HVAC:
case HDLApConfig.TYPE_AC_PANEL:
+ case HDLApConfig.TYPE_AC_TECHSYS:
lightBtn.setVisibility(View.GONE);
curtainBtn.setVisibility(View.GONE);
curtainBtn2.setVisibility(View.GONE);
@@ -241,7 +239,6 @@
curText2.setVisibility(View.GONE);
lightText.setVisibility(View.GONE);
logicText.setVisibility(View.GONE);
- sensorBtn.setVisibility(View.GONE);
sensorText.setVisibility(View.GONE);
@@ -389,7 +386,6 @@
curText1.setVisibility(View.GONE);
curText2.setVisibility(View.GONE);
lightText.setVisibility(View.GONE);
- sensorBtn.setVisibility(View.GONE);
sensorText.setVisibility(View.GONE);
break;
@@ -436,7 +432,7 @@
logicText.setVisibility(View.GONE);
if (appliancesInfo.getCurState() != null) {
float value = (float) appliancesInfo.getCurState();
- sensorBtn.setText("浼犳劅鍣ㄦ暟鍊硷細" + value);
+ sensorText.setText("浼犳劅鍣ㄦ暟鍊硷細" + value);
}
break;
@@ -515,7 +511,12 @@
appliancesInfo.setArrCurState(deviceStateBean.getArrCurState());
}
break;
-
+ case HDLApConfig.TYPE_AC_TECHSYS:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setArrCurState(deviceStateBean.getArrCurState());
+ }
+ break;
default:
break;
@@ -700,13 +701,6 @@
@Override
public void onClick(View view) {
HDLCommand.logicCtrl(appliancesInfo);
- }
- });
-
- sensorBtn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- HDLCommand.getDeviceStateFromLocal(appliancesInfo);
}
});
}
@@ -1026,6 +1020,7 @@
break;
case HDLApConfig.TYPE_AC_HVAC:
case HDLApConfig.TYPE_AC_PANEL:
+ case HDLApConfig.TYPE_AC_TECHSYS:
if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
if (!event.isSuccess()) {
showToast("鑾峰彇绌鸿皟鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
--
Gitblit v1.8.0