From 76bee0cb59c06d4616d70aace2cff4223c76a469 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 14 十月 2019 20:25:46 +0800
Subject: [PATCH] 2019.10.14
---
ZigbeeApp/Shared/Common/Room.cs | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
old mode 100755
new mode 100644
index e3440a1..f0492c4
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -36,14 +36,24 @@
/// 妤煎眰Id
/// 鏂板鏃朵娇鐢℅uid
/// </summary>
- public string FloorId = string.Empty;
+ public string FloorId = "Floor1";
+ /// <summary>
+ /// 妤煎眰鍚嶇О
+ /// </summary>
+ public string FloorName
+ {
+ get
+ {
+ return Config.Instance.Home.GetFloorNameById(FloorId);
+ }
+ }
/// <summary>
/// 鎴块棿鍚�
/// </summary>
public string Name = string.Empty;
/// <summary>
- /// 鎴块棿鐨勬椂鍊欒儗鏅浘
+ /// 鎴块棿鑳屾櫙鍥�
/// </summary>
public string BackgroundImage = string.Empty;
@@ -56,6 +66,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>
/// 褰撳墠閫夋嫨鐨勬埧闂�
@@ -73,6 +92,11 @@
public readonly List<string> DeviceUIFilePathList = new List<string>();
/// <summary>
+ /// 鍠滅埍鎴块棿id
+ /// </summary>
+ public const string LoveRoomId= "Favorite";
+
+ /// <summary>
/// 鏄惁鏄粯璁ゅ枩鐖辨埧闂�
/// </summary>
/// <value><c>true</c> if is love; otherwise, <c>false</c>.</value>
@@ -81,7 +105,7 @@
{
get
{
- return Id == "Favorite";
+ return Id == LoveRoomId;
}
}
@@ -110,8 +134,7 @@
{
return new List<string> { };
}
- var loveRoom = Lists[0];
- return loveRoom.DeviceUIFilePathList;
+ return GetLoveRoom().DeviceUIFilePathList;
}
}
@@ -204,7 +227,7 @@
if (Config.Instance.Home.RoomFilePathList.Contains("Room_Favorite.json") == false)
{
//榛樿娣诲姞鍠滅埍鐨勬埧闂�--绂佹淇敼鎴块棿鍚�
- var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "Room/r0.png", Id = "Favorite" };
+ var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "Room/r0.png", Id = LoveRoomId };
love.Save(true);
//娣诲姞鍒癶ouse 鎴块棿璺緞鍒楄〃
var currentHome = Config.Instance.Home;
@@ -323,6 +346,15 @@
#region 鈼� 鑾峰彇鎴块棿________________________
/// <summary>
+ /// 鑾峰彇鍠滅埍鎴块棿
+ /// </summary>
+ /// <returns></returns>
+ public static Room GetLoveRoom()
+ {
+ return CurrentRoom.GetRoomById(LoveRoomId);
+ }
+
+ /// <summary>
/// 閫氳繃璺緞鑾峰彇鎴块棿
/// </summary>
/// <returns>The room by file path.</returns>
@@ -430,6 +462,17 @@
return Lists.Find((obj) => obj.Id == roomId);
}
+
+ /// <summary>
+ /// 鏍规嵁鎴块棿鍚嶅瓧锛岃幏鍙栨埧闂村璞�
+ /// </summary>
+ /// <returns>The room by name.</returns>
+ /// <param name="roomName">鎴块棿鍚�</param>
+ public Room GetRoomByName(string roomName)
+ {
+ return Lists.Find((obj) => obj.Name == roomName);
+ }
+
/// <summary>
/// 鏍规嵁璁惧鑾峰彇鎴块棿鍚嶅瓧(妤煎眰+鎴块棿鍚�)
/// </summary>
@@ -500,6 +543,20 @@
return null;
}
+ /// <summary>
+ /// 鑾峰彇澶氫釜鎴块棿鐨勮繛鎺ヨ捣鏉ョ殑鍚嶅瓧
+ /// </summary>
+ /// <param name="listName"></param>
+ /// <returns></returns>
+ public string GetRoomName(List<string> listName)
+ {
+ if (listName.Count == 0)
+ {
+ //鏈垎閰嶅尯鍩�
+ return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
+ return string.Join(",", listName);
+ }
#endregion
@@ -670,7 +727,6 @@
#endregion
#region 鈼� 鍒犻櫎璁惧_________________________
-
/// <summary>
/// 鍒犻櫎鍔熻兘-璁惧
/// </summary>
@@ -786,6 +842,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 鈼� 娣诲姞鍦烘櫙_________________________
@@ -895,6 +973,28 @@
Save();
}
+ #endregion
+
+ #region 鈼� 璁惧鏄惁鏀惰棌______________________
+
+ /// <summary>
+ /// 鏄惁鏄敹钘忚澶�
+ /// </summary>
+ /// <param name="room"></param>
+ /// <param name="filePath"></param>
+ /// <returns></returns>
+ public bool IsCollectInRoom(Room room,string filePath)
+ {
+ if(room.IsLove)
+ {
+ return true;
+ }
+ if (GetLoveRoom().DeviceUIFilePathList.Find((obj) => obj == filePath) == null)
+ {
+ return false;
+ }
+ return true;
+ }
#endregion
#region 鈼� 淇敼鍦烘櫙________________________
@@ -1121,7 +1221,7 @@
var dicRoom = new Dictionary<string, Common.Room>();
foreach (var room in Common.Room.Lists)
{
- if (room.FloorId != i_floorKeys)
+ if (room.FloorId != i_floorKeys || room.IsLove == true)
{
//涓嶆槸鍚屼竴涓ゼ灞�
continue;
@@ -1237,6 +1337,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;
@@ -1245,5 +1347,6 @@
}
#endregion
+
}
}
--
Gitblit v1.8.0