From a7ab4b610972e20753dfedb3e5d80e4d9f017d07 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 14 八月 2020 10:39:08 +0800
Subject: [PATCH] 临时备份，测试1
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index 12546e0..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
@@ -274,10 +278,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 +351,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 +712,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;
@@ -728,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