From aeb4af0cadfaca52c9bfbe5257df285ad0cc2f39 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 04 十二月 2019 15:34:09 +0800
Subject: [PATCH] 2019-12-04-1
---
ZigbeeApp/Shared/Common/Room.cs | 420 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 210 insertions(+), 210 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Room.cs b/ZigbeeApp/Shared/Common/Room.cs
old mode 100644
new mode 100755
index a90c344..495100a
--- a/ZigbeeApp/Shared/Common/Room.cs
+++ b/ZigbeeApp/Shared/Common/Room.cs
@@ -44,7 +44,7 @@
{
get
{
- return Config.Instance.Home.GetFloorNameById(FloorId);
+ return Config.Instance.Home.GetFloorNameById(FloorId);
}
}
/// <summary>
@@ -67,12 +67,12 @@
/// </summary>
public Dictionary<string, string> FloorList = new Dictionary<string, string> { };
- /// <summary>
- /// 娓╁害浼犳劅鍣�(璁惧涓婚敭)
+ /// <summary>
+ /// 娓╁害浼犳劅鍣�(璁惧涓婚敭)
/// </summary>
public string TemperatrueDevice = string.Empty;
- /// <summary>
- /// 婀垮害浼犳劅鍣�(璁惧涓婚敭)
+ /// <summary>
+ /// 婀垮害浼犳劅鍣�(璁惧涓婚敭)
/// </summary>
public string HumidityDevice = string.Empty;
@@ -110,7 +110,7 @@
/// <summary>
/// 鍠滅埍鎴块棿id
/// </summary>
- public const string LoveRoomId = "Favorite";
+ public const string LoveRoomId= "Favorite";
/// <summary>
/// 鏄惁鏄粯璁ゅ枩鐖辨埧闂�
@@ -227,7 +227,7 @@
{
List<DeviceUI> deviceList = new List<DeviceUI>();
for (int i = 0; i < Lists.Count; i++)
- {
+ {
var room = Lists[i];
if (room.IsSharedRoom)
{
@@ -298,14 +298,14 @@
room.Name = $"{room.Name}";
}
Lists.Add(room);
-
+
}
}
Config.Instance.Home.InitFloor();
}
- /// <summary>
- /// 浠庢湰鍦伴噸鏂板姞杞藉叏閮ㄧ殑鎴块棿
+ /// <summary>
+ /// 浠庢湰鍦伴噸鏂板姞杞藉叏閮ㄧ殑鎴块棿
/// </summary>
public static void RefreshAllRoomByLocation()
{
@@ -436,7 +436,7 @@
//璁惧锛坉eviceUI锛�
beforeRoom.DeviceUIList.Clear();
foreach (var deviceFilePath in beforeRoom.DeviceUIFilePathList)
- {
+ {
beforeRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFilePath));
}
//鍦烘櫙(SceneUI)
@@ -487,7 +487,7 @@
}
return nowRoom;
}
- catch (Exception ex)
+ catch(Exception ex)
{
return null;
}
@@ -525,15 +525,15 @@
public string GetRoomNameByDevice(CommonDevice device)
{
var room = this.GetRoomByDevice(device);
- if (room == null)
- {
- //鏈垎閰嶅尯鍩�
- return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ if (room == null)
+ {
+ //鏈垎閰嶅尯鍩�
+ return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
}
- if (Config.Instance.Home.FloorDics.ContainsKey(room.FloorId) == true)
- {
- //(妤煎眰+鎴块棿鍚�)
- return Config.Instance.Home.FloorDics[room.FloorId] + " " + room.Name;
+ if (Config.Instance.Home.FloorDics.ContainsKey(room.FloorId) == true)
+ {
+ //(妤煎眰+鎴块棿鍚�)
+ return Config.Instance.Home.FloorDics[room.FloorId] + " " + room.Name;
}
return room.Name;
}
@@ -589,21 +589,21 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public List<Room> GetRoomsByFloorId(string id)
+ public List<Room> GetRoomsByFloorId(string id)
{
- return Lists.FindAll((obj) => obj.FloorId == id);
+ return Lists.FindAll((obj) => obj.FloorId==id);
}
/// <summary>
/// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂村悕绉�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public List<string> GetRoomNamesByFloorId(string id)
+ public List<string> GetRoomNamesByFloorId(string id)
{
List<string> names = new List<string> { };
- foreach (var r in Lists)
+ foreach(var r in Lists)
{
- if (r.FloorId == id)
+ if(r.FloorId==id)
{
names.Add(r.Name);
}
@@ -616,9 +616,9 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public List<Room> GetRoomsByFloorIdAppendLoveRoom(string id)
+ public List<Room> GetRoomsByFloorIdAppendLoveRoom(string id)
{
- var r = Lists.FindAll((obj) => obj.FloorId == id);
+ var r= Lists.FindAll((obj) => obj.FloorId == id);
r.Insert(0, GetLoveRoom());
return r;
}
@@ -627,7 +627,7 @@
/// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂�(鎷兼帴浜嗐�愬父鐢ㄣ�戝湪绗竴浣�)
/// </summary>
/// <returns></returns>
- public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
+ public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
{
if(Config.Instance.Home.FloorDics.Count==0)
{
@@ -664,8 +664,8 @@
{
room.AddDevice(device, saveRealRoom);
}
- }
-
+ }
+
/// <summary>
/// 鎴块棿鍚嶅瓧鏄惁鏈変慨鏀�
/// </summary>
@@ -675,9 +675,9 @@
public bool IsRoomChanged(CommonDevice device, string roomId)
{
var room = this.GetRoomByDevice(device);
- if (room == null || room.Id != roomId)
- {
- return true;
+ if (room == null || room.Id != roomId)
+ {
+ return true;
}
return false;
}
@@ -734,7 +734,7 @@
try
{
var newPath = System.IO.Path.Combine(Config.Instance.FullPath, newFile);
- var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, oldFile);
+ var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath,oldFile);
Global.MoveFileToDirectory(path, newPath);
//澶囦唤
Phone.UserCenter.HdlAutoBackupLogic.AddOrEditorFile(oldFile);
@@ -869,9 +869,9 @@
return Common.LocalDevice.Current.GetDeviceUI(device);
}
- /// <summary>
- /// 鑾峰彇褰撳墠鎴块棿涓嬬殑鍏ㄩ儴璁惧
- /// </summary>
+ /// <summary>
+ /// 鑾峰彇褰撳墠鎴块棿涓嬬殑鍏ㄩ儴璁惧
+ /// </summary>
/// <returns></returns>
public List<CommonDevice> GetRoomListDevice()
{
@@ -915,7 +915,7 @@
/// <param name="room"></param>
/// <param name="deviceType"></param>
/// <returns></returns>
- public static List<DeviceUI> GetDeviceUIs(Room room, DeviceType deviceType)
+ public static List<DeviceUI> GetDeviceUIs(Room room ,DeviceType deviceType)
{
List<DeviceUI> typeList = new List<DeviceUI> { };
foreach (var deviceUI in room.DeviceUIList)
@@ -924,7 +924,7 @@
{
continue;
}
- if (deviceUI.CommonDevice.Type != deviceType)
+ if(deviceUI.CommonDevice.Type!=deviceType)
{
continue;
}
@@ -982,14 +982,14 @@
public async System.Threading.Tasks.Task<int> AddScene(string sceneName, string sceneIconPath, List<ZigBee.Device.Scene.AddSceneMemberData> commons, int iconPathType = 0)
{
var scenes = GetSceneUIsByFloorId(FloorId);
- if (scenes != null && scenes.Count > 0)
+ if(scenes!=null && scenes.Count>0)
{
if (scenes.Find(s => s.Name == sceneName) != null)
{
return -1;
}
}
-
+
var getSceneIdAllData = await ZigBee.Device.Scene.GetSceneNewIdAsync(sceneName);
if (getSceneIdAllData == null || getSceneIdAllData.getSceneIdData == null)
{
@@ -1009,7 +1009,7 @@
ScenesId = getSceneIdData.NewScenesId,
TaskList = common.TaskList,
DelayTime = common.DelayTime,
- MemberNumber = common.MemberNumber,
+ MemberNumber=common.MemberNumber,
ElseScenesId = common.ElseScenesId
};
//common.ScenesId = getSceneIdData.NewScenesId;
@@ -1041,7 +1041,7 @@
Id = getSceneIdData.NewScenesId,
IconPath = fullPath,
IconPathType = iconPathType,
- AddSceneMemberDataList = commons
+ AddSceneMemberDataList= commons
};
SceneUIList.Add(sceneUI);
SceneUIFilePathList.Add(sceneUI.FileName);
@@ -1096,9 +1096,9 @@
/// <param name="room"></param>
/// <param name="filePath"></param>
/// <returns></returns>
- public bool IsCollectInRoom(Room room, string filePath)
+ public bool IsCollectInRoom(Room room,string filePath)
{
- if (room.IsLove)
+ if(room.IsLove)
{
return true;
}
@@ -1155,7 +1155,7 @@
TaskList = addCommon.TaskList,
DelayTime = addCommon.DelayTime,
ElseScenesId = addCommon.ElseScenesId,
- MemberNumber = addCommon.MemberNumber
+ MemberNumber=addCommon.MemberNumber
};
//娣诲姞鏂版垚鍛� 杩斿洖缁撴灉
var addSceneMemberResponseAllData = await ZigBee.Device.Scene.AddSceneMemberAsync(addSceneMemberData);
@@ -1191,7 +1191,7 @@
/// <param name="sceneUI">Scene user interface.</param>
public void RemoveScene(SceneUI sceneUI)
{
- if (Global.IsExistsByHomeId(sceneUI.FileName) == false)
+ if(Global.IsExistsByHomeId(sceneUI.FileName)==false)
{
return;
}
@@ -1233,8 +1233,8 @@
public List<SceneUI> GetSameFloorScenes(string floorId)
{
List<SceneUI> sceneUIs = new List<SceneUI> { };
- var rooms = CurrentRoom.GetRoomsByFloorId(floorId);
- foreach (var r in rooms)
+ var rooms= CurrentRoom.GetRoomsByFloorId(floorId);
+ foreach(var r in rooms)
{
sceneUIs.AddRange(r.SceneUIList);
}
@@ -1312,168 +1312,168 @@
{
HdlAutoBackupLogic.AddOrEditorFile(FileName);
}
- }
-
+ }
+
#endregion
-
- #region 鈼� 妤煎眰鍜屾埧闂撮『搴忕浉鍏砡______________
-
- /// <summary>
- /// 鏍规嵁妤煎眰鐨勪富閿幏鍙栨帓搴忓悗鐨勬埧闂村垪琛�
- /// </summary>
- /// <param name="i_floorKeys">妤煎眰鐨勪富閿�</param>
- /// <param name="getShard">鍒嗕韩鐨勬埧闂存槸鍚︿篃鑾峰彇</param>
- /// <returns></returns>
- public List<Room> GetFloorSortRoom(string i_floorKeys, bool getShard = true)
- {
- Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
- //璇诲彇鎴块棿椤哄簭
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
- {
- dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
- }
-
- var listRoomSort = new List<string>();
- if (dicAllSort.ContainsKey(i_floorKeys) == true)
- {
- listRoomSort = dicAllSort[i_floorKeys];
- }
- else
- {
- dicAllSort[i_floorKeys] = listRoomSort;
- }
-
- var dicRoom = new Dictionary<string, Common.Room>();
- foreach (var room in Common.Room.Lists)
- {
- if (room.FloorId != i_floorKeys || room.IsLove == true)
- {
- //涓嶆槸鍚屼竴涓ゼ灞�
- continue;
- }
- if (listRoomSort.Contains(room.Id) == false)
- {
- //鏂版坊鍔犵殑鎴块棿
- listRoomSort.Add(room.Id);
- }
- if (getShard == false && room.IsSharedRoom == true)
- {
- //涓嶈鍒嗕韩鐨勬埧闂�
- continue;
- }
- dicRoom[room.Id] = room;
- }
-
- var listSortRoom = new List<Room>();
- for (int i = 0; i < listRoomSort.Count; i++)
- {
- if (dicRoom.ContainsKey(listRoomSort[i]) == true)
- {
- listSortRoom.Add(dicRoom[listRoomSort[i]]);
- }
- }
-
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, dicAllSort);
- return listSortRoom;
- }
-
- /// <summary>
- /// 淇濆瓨鎴块棿鐨勯『搴�
- /// </summary>
- /// <param name="i_floorKeys">妤煎眰涓婚敭</param>
- /// <param name="listSort">鎴块棿椤哄簭(鎴块棿鐨勪富閿�)</param>
- public void SaveRoomSort(string i_floorKeys, List<string> listSort)
- {
- Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
- //璇诲彇鎴块棿椤哄簭
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
- {
- dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
- }
-
- //淇濆瓨椤哄簭
- dicAllSort[i_floorKeys] = listSort;
- UserCenterLogic.SaveFileContent(fullName, dicAllSort);
- dicAllSort.Clear();
- }
-
- /// <summary>
- /// 鑾峰彇鎺掑簭鍚庣殑妤煎眰
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, string> GetFloorSortList()
- {
- //璇诲彇妤煎眰椤哄簭
- var listFloorSort = new List<string>();
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
- {
- listFloorSort = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(strData);
- }
- foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)
- {
- if (listFloorSort.Contains(keys) == false)
- {
- //鏂版坊鍔犵殑妤煎眰
- listFloorSort.Add(keys);
- }
- }
-
- var dic = new Dictionary<string, string>();
- for (int i = 0; i < listFloorSort.Count; i++)
- {
- if (Config.Instance.Home.FloorDics.ContainsKey(listFloorSort[i]) == true)
- {
- dic[listFloorSort[i]] = Config.Instance.Home.FloorDics[listFloorSort[i]];
- }
- }
-
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, listFloorSort);
- return dic;
- }
-
- /// <summary>
- /// 淇濆瓨妤煎眰鐨勯『搴�
- /// </summary>
- /// <param name="listSort">妤煎眰鐨勪富閿�</param>
- public void SaveFloorSort(List<string> listSort)
- {
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, listSort);
- }
-
+
+ #region 鈼� 妤煎眰鍜屾埧闂撮『搴忕浉鍏砡______________
+
+ /// <summary>
+ /// 鏍规嵁妤煎眰鐨勪富閿幏鍙栨帓搴忓悗鐨勬埧闂村垪琛�
+ /// </summary>
+ /// <param name="i_floorKeys">妤煎眰鐨勪富閿�</param>
+ /// <param name="getShard">鍒嗕韩鐨勬埧闂存槸鍚︿篃鑾峰彇</param>
+ /// <returns></returns>
+ public List<Room> GetFloorSortRoom(string i_floorKeys, bool getShard = true)
+ {
+ Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
+ //璇诲彇鎴块棿椤哄簭
+ string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
+ var strData = UserCenterLogic.LoadFileContent(fullName);
+ if (strData != null)
+ {
+ dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
+ }
+
+ var listRoomSort = new List<string>();
+ if (dicAllSort.ContainsKey(i_floorKeys) == true)
+ {
+ listRoomSort = dicAllSort[i_floorKeys];
+ }
+ else
+ {
+ dicAllSort[i_floorKeys] = listRoomSort;
+ }
+
+ var dicRoom = new Dictionary<string, Common.Room>();
+ foreach (var room in Common.Room.Lists)
+ {
+ if (room.FloorId != i_floorKeys || room.IsLove == true)
+ {
+ //涓嶆槸鍚屼竴涓ゼ灞�
+ continue;
+ }
+ if (listRoomSort.Contains(room.Id) == false)
+ {
+ //鏂版坊鍔犵殑鎴块棿
+ listRoomSort.Add(room.Id);
+ }
+ if (getShard == false && room.IsSharedRoom == true)
+ {
+ //涓嶈鍒嗕韩鐨勬埧闂�
+ continue;
+ }
+ dicRoom[room.Id] = room;
+ }
+
+ var listSortRoom = new List<Room>();
+ for (int i = 0; i < listRoomSort.Count; i++)
+ {
+ if (dicRoom.ContainsKey(listRoomSort[i]) == true)
+ {
+ listSortRoom.Add(dicRoom[listRoomSort[i]]);
+ }
+ }
+
+ //淇濆瓨椤哄簭
+ UserCenterLogic.SaveFileContent(fullName, dicAllSort);
+ return listSortRoom;
+ }
+
+ /// <summary>
+ /// 淇濆瓨鎴块棿鐨勯『搴�
+ /// </summary>
+ /// <param name="i_floorKeys">妤煎眰涓婚敭</param>
+ /// <param name="listSort">鎴块棿椤哄簭(鎴块棿鐨勪富閿�)</param>
+ public void SaveRoomSort(string i_floorKeys, List<string> listSort)
+ {
+ Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
+ //璇诲彇鎴块棿椤哄簭
+ string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
+ var strData = UserCenterLogic.LoadFileContent(fullName);
+ if (strData != null)
+ {
+ dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
+ }
+
+ //淇濆瓨椤哄簭
+ dicAllSort[i_floorKeys] = listSort;
+ UserCenterLogic.SaveFileContent(fullName, dicAllSort);
+ dicAllSort.Clear();
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎺掑簭鍚庣殑妤煎眰
+ /// </summary>
+ /// <returns></returns>
+ public Dictionary<string, string> GetFloorSortList()
+ {
+ //璇诲彇妤煎眰椤哄簭
+ var listFloorSort = new List<string>();
+ string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
+ var strData = UserCenterLogic.LoadFileContent(fullName);
+ if (strData != null)
+ {
+ listFloorSort = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(strData);
+ }
+ foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)
+ {
+ if (listFloorSort.Contains(keys) == false)
+ {
+ //鏂版坊鍔犵殑妤煎眰
+ listFloorSort.Add(keys);
+ }
+ }
+
+ var dic = new Dictionary<string, string>();
+ for (int i = 0; i < listFloorSort.Count; i++)
+ {
+ if (Config.Instance.Home.FloorDics.ContainsKey(listFloorSort[i]) == true)
+ {
+ dic[listFloorSort[i]] = Config.Instance.Home.FloorDics[listFloorSort[i]];
+ }
+ }
+
+ //淇濆瓨椤哄簭
+ UserCenterLogic.SaveFileContent(fullName, listFloorSort);
+ return dic;
+ }
+
+ /// <summary>
+ /// 淇濆瓨妤煎眰鐨勯『搴�
+ /// </summary>
+ /// <param name="listSort">妤煎眰鐨勪富閿�</param>
+ public void SaveFloorSort(List<string> listSort)
+ {
+ string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
+ //淇濆瓨椤哄簭
+ UserCenterLogic.SaveFileContent(fullName, listSort);
+ }
+
+ #endregion
+
+ #region 鈼� 鍏嬮殕鎴块棿瀵硅薄_____________________
+
+ /// <summary>
+ /// 鍏嬮殕鎴块棿瀵硅薄
+ /// </summary>
+ /// <returns></returns>
+ public Room CloneRoomClass()
+ {
+ var newRoom = new Room();
+ //鍏嬮殕灞炴��
+ 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;
+
+ return newRoom;
+ }
+
#endregion
-
- #region 鈼� 鍏嬮殕鎴块棿瀵硅薄_____________________
-
- /// <summary>
- /// 鍏嬮殕鎴块棿瀵硅薄
- /// </summary>
- /// <returns></returns>
- public Room CloneRoomClass()
- {
- var newRoom = new Room();
- //鍏嬮殕灞炴��
- 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;
-
- return newRoom;
- }
-
- #endregion
-
+
}
}
--
Gitblit v1.8.0