~wjc/HomeApp.git

			@@ -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>
			/// 是否是默认喜爱房间
			@@ -130,12 +130,6 @@
			/// 注：分享过来的房间不能删除，不能编辑该房间，不能对设备（功能）、场景进行增删改
			/// </summary>
			public bool IsSharedRoom = false;

			/// <summary>
			/// 是否可以刷新房间数据了
			/// 需要等初始化本地设备数据后在可以初始化房间数据
			/// </summary>
			public static bool CanInitAllRoom;

			/// <summary>
			/// 获取喜爱房间的所有设备路径
			@@ -233,7 +227,7 @@
			{
			List<DeviceUI> deviceList = new List<DeviceUI>();
			for (int i = 0; i < Lists.Count; i++)
			{
			{
			var room = Lists[i];
			if (room.IsSharedRoom)
			{
			@@ -282,20 +276,16 @@
			/// </summary>
			public static void InitAllRoom()
			{
			//if (CanInitAllRoom == false)
			//{
			// return;
			//}
			Lists.Clear();
			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 = LoveRoomId };
			love.Save(true);
			var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.JPG", Id = LoveRoomId };
			love.Save(false);
			//添加到house 房间路径列表
			var currentHome = Config.Instance.Home;
			currentHome.RoomFilePathList.Insert(0, love.FileName);
			currentHome.Save();
			currentHome.Save(false);
			}
			foreach (var roomFilePath in Config.Instance.Home.RoomFilePathList)
			{
			@@ -305,42 +295,43 @@
			{
			if (room.IsSharedRoom)
			{
			room.Name = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){room.Name}";
			room.Name = $"{room.Name}";
			}
			Lists.Add(room);

			}
			}
			Config.Instance.Home.InitFloor();
			}

			/// <summary>
			/// 从本地重新加载全部的房间
			/// <summary>
			/// 从本地重新加载全部的房间
			/// </summary>
			public static void RefreshAllRoomByLocation()
			{
			Lists.Clear();
			var homeTemp = Config.Instance.Home;
			homeTemp.RoomFilePathList.Clear();

			var listFile = Global.FileListByHomeId();

			//我的喜爱的房间必须要在第0位才行
			string fRoom = "Room_Favorite.json";
			if (listFile.Contains(fRoom) == true)
			{
			listFile.Remove(fRoom);
			homeTemp.AddRoomListFilePath(fRoom);
			}

			foreach (string fileName in listFile)
			{
			if (fileName.StartsWith("Room_"))
			{
			homeTemp.AddRoomListFilePath(fileName);
			}
			}
			homeTemp.Save(false);
			CanInitAllRoom = true;
			InitAllRoom();
			public static void RefreshAllRoomByLocation()
			{
			Lists.Clear();
			var homeTemp = Config.Instance.Home;
			homeTemp.RoomFilePathList.Clear();

			var listFile = Global.FileListByHomeId();

			//我的喜爱的房间必须要在第0位才行
			string fRoom = "Room_Favorite.json";
			if (listFile.Contains(fRoom) == true)
			{
			listFile.Remove(fRoom);
			homeTemp.AddRoomListFilePath(fRoom);
			}

			foreach (string fileName in listFile)
			{
			if (fileName.StartsWith("Room_"))
			{
			homeTemp.AddRoomListFilePath(fileName);
			}
			}
			homeTemp.Save(false);
			InitAllRoom();
			}

			#endregion
			@@ -445,7 +436,7 @@
			//设备（deviceUI）
			beforeRoom.DeviceUIList.Clear();
			foreach (var deviceFilePath in beforeRoom.DeviceUIFilePathList)
			{
			{
			beforeRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFilePath));
			}
			//场景(SceneUI)
			@@ -496,7 +487,7 @@
			}
			return nowRoom;
			}
			catch (Exception ex)
			catch(Exception ex)
			{
			return null;
			}
			@@ -534,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;
			}
			@@ -582,6 +573,10 @@
			{
			foreach (var r in Lists)
			{
			if (r.IsLove)
			{
			continue;
			}
			foreach (var scene in r.SceneUIList)
			{
			if (scene.Id == sceneId)
			@@ -598,21 +593,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);
			}
			@@ -625,9 +620,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;
			}
			@@ -636,7 +631,7 @@
			/// 获取当前楼层的房间(拼接了【常用】在第一位)
			/// </summary>
			/// <returns></returns>
			public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
			public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
			{
			if(Config.Instance.Home.FloorDics.Count==0)
			{
			@@ -656,7 +651,8 @@
			/// </summary>
			/// <param name="device">设备对象</param>
			/// <param name="roomId">新房间Id</param>
			public void ChangedRoom(CommonDevice device, string roomId)
			/// <param name="saveRealRoom">是否修改真实物理设备的房间,不出意外,这个值默认为true即可</param>
			public void ChangedRoom(CommonDevice device, string roomId, bool saveRealRoom = true)
			{
			//房间是否修改
			if (this.IsRoomChanged(device, roomId) == false)
			@@ -668,12 +664,12 @@

			//添加到新的房间
			var room = this.GetRoomById(roomId);
			if (room != null)
			{
			room.AddDevice(device);
			if (room != null)
			{
			room.AddDevice(device, saveRealRoom);
			}
			}

			}

			/// <summary>
			/// 房间名字是否有修改
			/// </summary>
			@@ -683,9 +679,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;
			}
			@@ -742,7 +738,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);
			@@ -759,7 +755,7 @@
			#region ◆ 添加设备________________________

			/// <summary>
			/// 添加设备
			/// 添加设备(此方法目前只给【我的喜爱】使用)
			/// </summary>
			/// <param name="deviceUIFilePath">Device UIF ile path.</param>
			public void AddDevice(string deviceUIFilePath)
			@@ -784,10 +780,11 @@
			}

			/// <summary>
			/// 添加设备
			/// 添加设备(此方法目前只给Room里面使用)
			/// </summary>
			/// <param name="device">要添加的设备对象</param>
			public void AddDevice(CommonDevice device)
			/// <param name="saveRealRoom">是否修改真实物理设备的房间,不出意外,这个值默认为true即可</param>
			public void AddDevice(CommonDevice device, bool saveRealRoom)
			{
			if (device == null)
			{
			@@ -795,9 +792,6 @@
			}
			//设备信息保存到本地
			device.Save();

			//添加自动备份
			HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);

			var deviceUI = Common.LocalDevice.Current.GetDeviceUI(device);
			if (DeviceUIFilePathList.Contains(deviceUI.FileName) == false)
			@@ -809,6 +803,11 @@

			//添加自动备份
			HdlAutoBackupLogic.AddOrEditorFile(FileName);
			if (saveRealRoom == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)
			{
			//如果只有一个回路,则修改真实物理设备的房间
			LocalDevice.Current.SaveRealDeviceRoomId(new List<CommonDevice>() { device }, this.Id, false);
			}
			}
			}

			@@ -874,9 +873,9 @@
			return Common.LocalDevice.Current.GetDeviceUI(device);
			}

			/// <summary>
			/// 获取当前房间下的全部设备
			/// </summary>
			/// <summary>
			/// 获取当前房间下的全部设备
			/// </summary>
			/// <returns></returns>
			public List<CommonDevice> GetRoomListDevice()
			{
			@@ -920,7 +919,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)
			@@ -929,7 +928,7 @@
			{
			continue;
			}
			if (deviceUI.CommonDevice.Type != deviceType)
			if(deviceUI.CommonDevice.Type!=deviceType)
			{
			continue;
			}
			@@ -987,14 +986,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)
			{
			@@ -1014,7 +1013,7 @@
			ScenesId = getSceneIdData.NewScenesId,
			TaskList = common.TaskList,
			DelayTime = common.DelayTime,
			MemberNumber = common.MemberNumber,
			MemberNumber=common.MemberNumber,
			ElseScenesId = common.ElseScenesId
			};
			//common.ScenesId = getSceneIdData.NewScenesId;
			@@ -1046,7 +1045,7 @@
			Id = getSceneIdData.NewScenesId,
			IconPath = fullPath,
			IconPathType = iconPathType,
			AddSceneMemberDataList = commons
			AddSceneMemberDataList= commons
			};
			SceneUIList.Add(sceneUI);
			SceneUIFilePathList.Add(sceneUI.FileName);
			@@ -1101,9 +1100,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;
			}
			@@ -1160,7 +1159,7 @@
			TaskList = addCommon.TaskList,
			DelayTime = addCommon.DelayTime,
			ElseScenesId = addCommon.ElseScenesId,
			MemberNumber = addCommon.MemberNumber
			MemberNumber=addCommon.MemberNumber
			};
			//添加新成员返回结果
			var addSceneMemberResponseAllData = await ZigBee.Device.Scene.AddSceneMemberAsync(addSceneMemberData);
			@@ -1196,7 +1195,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;
			}
			@@ -1205,7 +1204,6 @@
			Save();
			Global.DeleteFilebyHomeId(sceneUI.FileName);
			HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
			HdlAutoBackupLogic.AddOrEditorFile(FileName);
			}

			#endregion
			@@ -1221,6 +1219,10 @@
			{
			foreach (var r in Lists)
			{
			if (r.IsLove)
			{
			continue;
			}
			foreach (var sceneUI in r.SceneUIList)
			{
			if (sceneUI.Id == sceneId)
			@@ -1231,6 +1233,7 @@
			}
			return null;
			}

			/// <summary>
			/// 获取该楼层所有场景
			/// </summary>
			@@ -1239,8 +1242,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);
			}
			@@ -1318,168 +1321,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


			}
			}