From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 12 十月 2019 15:45:10 +0800
Subject: [PATCH] 合并门锁，完成住宅管理
---
ZigbeeApp/Shared/Common/Room.cs | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
index c7ef0ed..282f05b 100755
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -67,6 +67,15 @@
/// </summary>
public Dictionary<string, string> FloorList = new Dictionary<string, string> { };
+ /// <summary>
+ /// 娓╁害浼犳劅鍣�(璁惧涓婚敭)
+ /// </summary>
+ public string TemperatrueDevice = string.Empty;
+ /// <summary>
+ /// 婀垮害浼犳劅鍣�(璁惧涓婚敭)
+ /// </summary>
+ public string HumidityDevice = string.Empty;
+
/// <summary>
/// 褰撳墠閫夋嫨鐨勬埧闂�
/// </summary>
@@ -809,6 +818,28 @@
}
}
+ /// <summary>
+ /// 鑾峰彇褰撳墠鎴块棿涓嬬殑鍏ㄩ儴璁惧
+ /// </summary>
+ /// <returns></returns>
+ public List<CommonDevice> GetRoomListDevice()
+ {
+ var listDevice = new List<CommonDevice>();
+ foreach (var device in this.DeviceUIList)
+ {
+ if (device == null || device.CommonDevice == null)
+ {
+ continue;
+ }
+ listDevice.Add(device.CommonDevice);
+ }
+ if (listDevice.Count == 0)
+ {
+ return listDevice;
+ }
+ return Common.LocalDevice.Current.SortDevice(listDevice);
+ }
+
#endregion
#region 鈼� 娣诲姞鍦烘櫙_________________________
@@ -1282,6 +1313,8 @@
//鍏嬮殕灞炴��
newRoom.Id = this.Id;
newRoom.FloorId = this.FloorId;
+ newRoom.TemperatrueDevice = this.TemperatrueDevice;
+ newRoom.HumidityDevice = this.HumidityDevice;
newRoom.Name = this.Name;
newRoom.BackgroundImage = this.BackgroundImage;
newRoom.BackgroundImageType = this.BackgroundImageType;
--
Gitblit v1.8.0