From fd78a0c0e444b83f40a9225c98adceb87bbda329 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 18 一月 2020 15:10:34 +0800
Subject: [PATCH] 2020-1-18 1.修复RCU混合调光混合开关 类模块，使用物理回路问题。
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..c20867d 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
@@ -702,7 +702,7 @@
if (event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
&& event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
- && event.getLightCtrlBackInfo().getChannelNum() == appliancesInfo.getChannelNum()
+ && event.getLightCtrlBackInfo().getChannelNum() == appliancesInfo.getChannelNum() && event.getLightCtrlBackInfo().getPhysicsChannelNum() == appliancesInfo.getPhysicsChannelNum()
) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
@@ -945,7 +945,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