From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index ee1cf2c..f0739e7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -37,6 +37,10 @@
/// 绌鸿皟鐩爣
/// </summary>
AC = 5,
+ /// <summary>
+ /// 鍦版殩鐩爣
+ /// </summary>
+ Fh = 6,
}
#endregion
@@ -725,12 +729,8 @@
{
bool result = true;
//鑾峰彇璁惧绫诲瀷鐨�
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
- {
- result = false;
- }
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 514);
+ if (clu != null)
{
result = false;
}
--
Gitblit v1.8.0