From c9978ac37e3e9817ab07b25dbb499b28918403fd Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 20 十月 2020 15:49:54 +0800
Subject: [PATCH] 2020-10-20 1.增加RGB和CCT灯控制协议
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java | 133 +++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 64 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
index 543a8af..1515780 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
@@ -432,75 +432,77 @@
// 鑾峰彇鎵�鏈夎澶囩殑鐘舵�併�俤eviceStateBeanList涓烘墍鏈夎澶囩殑鐘舵�佸垪琛�
List<DeviceStateBean> deviceStateBeanList = HDLCommand.getAllDevicesState();
// 绗笁鏂瑰彲鏍规嵁鑷繁鐨勯渶姹傚埛鏂拌澶囬〉銆備互涓嬩负绀轰緥浠ｇ爜銆�
- for (DeviceStateBean deviceStateBean : deviceStateBeanList) {
- //娉ㄦ剰锛佺涓夋柟搴旇灏嗚澶囬泦鍚堝叏閮ㄥ湪杩欓噷閬嶅巻涓�閬嶄互涓嬫搷浣滐紝骞舵洿鏂扮姸鎬佸�笺�傝繖閲屼粎浣滀负Demo婕旂ず锛屽彧鍒ゆ柇涓�涓��
+ if(deviceStateBeanList != null) {
+ for (DeviceStateBean deviceStateBean : deviceStateBeanList) {
+ //娉ㄦ剰锛佺涓夋柟搴旇灏嗚澶囬泦鍚堝叏閮ㄥ湪杩欓噷閬嶅巻涓�閬嶄互涓嬫搷浣滐紝骞舵洿鏂扮姸鎬佸�笺�傝繖閲屼粎浣滀负Demo婕旂ず锛屽彧鍒ゆ柇涓�涓��
- //鍏堝垽鏂妯″潡鏄惁涓哄綋鍓嶈澶囩殑妯″潡
- if (deviceStateBean.getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
- && deviceStateBean.getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()) {
+ //鍏堝垽鏂妯″潡鏄惁涓哄綋鍓嶈澶囩殑妯″潡
+ if (deviceStateBean.getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
+ && deviceStateBean.getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()) {
// 鍐嶅垽鏂槸浠�涔堢被鍨嬬殑璁惧銆�
- switch (deviceStateBean.getDeviceType()) {
- case HDLApConfig.TYPE_LIGHT_DIMMER:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setCurState(deviceStateBean.getCurState());
- }
- break;
- case HDLApConfig.TYPE_LIGHT_RELAY:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setCurState(deviceStateBean.getCurState());
- }
- break;
- case HDLApConfig.TYPE_LIGHT_MIX_DIMMER:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setCurState(deviceStateBean.getCurState());
- }
- break;
- case HDLApConfig.TYPE_LIGHT_MIX_RELAY:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setCurState(deviceStateBean.getCurState());
- }
- break;
- case HDLApConfig.TYPE_CURTAIN_GLYSTRO:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setCurState(deviceStateBean.getCurState());
- }
- break;
- case HDLApConfig.TYPE_CURTAIN_ROLLER:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setCurState(deviceStateBean.getCurState());
- }
- break;
- case HDLApConfig.TYPE_CURTAIN_MODULE:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setCurState(deviceStateBean.getCurState());
- }
- break;
- case HDLApConfig.TYPE_AC_HVAC:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setArrCurState(deviceStateBean.getArrCurState());
- }
- break;
- case HDLApConfig.TYPE_AC_PANEL:
- //鍒ゆ柇鏄摢涓洖璺殑璁惧
- if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
- appliancesInfo.setArrCurState(deviceStateBean.getArrCurState());
- }
- break;
+ switch (deviceStateBean.getDeviceType()) {
+ case HDLApConfig.TYPE_LIGHT_DIMMER:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setCurState(deviceStateBean.getCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_LIGHT_RELAY:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setCurState(deviceStateBean.getCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_LIGHT_MIX_DIMMER:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setCurState(deviceStateBean.getCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_LIGHT_MIX_RELAY:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setCurState(deviceStateBean.getCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_CURTAIN_GLYSTRO:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setCurState(deviceStateBean.getCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_CURTAIN_ROLLER:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setCurState(deviceStateBean.getCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_CURTAIN_MODULE:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setCurState(deviceStateBean.getCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_AC_HVAC:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setArrCurState(deviceStateBean.getArrCurState());
+ }
+ break;
+ case HDLApConfig.TYPE_AC_PANEL:
+ //鍒ゆ柇鏄摢涓洖璺殑璁惧
+ if (deviceStateBean.getChannelNum() == appliancesInfo.getChannelNum()) {
+ appliancesInfo.setArrCurState(deviceStateBean.getArrCurState());
+ }
+ break;
- default:
- break;
+ default:
+ break;
+ }
}
- }
+ }
}
}
@@ -703,6 +705,9 @@
if (event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
&& event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
&& event.getLightCtrlBackInfo().getChannelNum() == appliancesInfo.getChannelNum()
+ && event.getLightCtrlBackInfo().getPhysicsChannelNum() == appliancesInfo.getPhysicsChannelNum()
+
+ && event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceType() == appliancesInfo.getDeviceType()
) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
@@ -945,7 +950,7 @@
case HDLApConfig.TYPE_LIGHT_RELAY:
case HDLApConfig.TYPE_LIGHT_MIX_DIMMER:
case HDLApConfig.TYPE_LIGHT_MIX_RELAY:
- if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum()) {
+ if (appliancesInfo.getChannelNum() == event.getAppliancesInfo().getChannelNum() && appliancesInfo.getPhysicsChannelNum() == event.getAppliancesInfo().getPhysicsChannelNum()) {
if (!event.isSuccess()) {
showToast("鑾峰彇鐏厜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
--
Gitblit v1.8.0