From 23420922845c9e77019a55c3b3e3271eb1ec261e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 13 七月 2020 11:42:18 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index 12546e0..ee1cf2c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -274,10 +274,10 @@
}
/// <summary>
- /// 鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂村垪琛�
+ /// 鑾峰彇鏀寔鐨勬埧闂村垪琛�
/// </summary>
/// <returns></returns>
- public static List<Room> GetFloorRoomList()
+ public static List<Room> GetSupportRoomList()
{
var supportRoomListTemp = new List<Room>();
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
@@ -347,10 +347,7 @@
var device = LocalDevice.Current.GetDevice(de);
if (device != null)
{
- //鑾峰彇璁惧绫诲瀷鐨�
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
- //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
- if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ if (BindInfo.checkRealFreshAirDevice(device) == false)
{
continue;
}
@@ -711,7 +708,7 @@
{
bool result = true;
//鑾峰彇璁惧绫诲瀷鐨�
- var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 513);
+ var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 513 || obj.OutCluster == 514);
if (clu != null)
{
result = false;
--
Gitblit v1.8.0