~xm/HomeApp.git

			@@ -280,12 +280,12 @@
			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)
			{
			@@ -298,8 +298,10 @@
			room.Name = $"{room.Name}";
			}
			Lists.Add(room);

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

			/// <summary>
			@@ -321,15 +323,45 @@
			homeTemp.AddRoomListFilePath(fRoom);
			}

			var listRoomFile = new List<string>();
			foreach (string fileName in listFile)
			{
			if (fileName.StartsWith("Room_"))
			{
			homeTemp.AddRoomListFilePath(fileName);
			listRoomFile.Add(fileName);
			}
			}
			//检测楼层数据的合法性
			CheckFloorData(listRoomFile);

			homeTemp.Save(false);
			InitAllRoom();
			}

			/// <summary>
			/// 检测楼层数据的合法性
			/// </summary>
			/// <param name="listRoomFile"></param>
			private static void CheckFloorData(List<string> listRoomFile)
			{
			for (int i = 0; i < listRoomFile.Count; i++)
			{
			try
			{
			var byteData = Global.ReadFileByHomeId(listRoomFile[i]);
			string valueData = System.Text.Encoding.UTF8.GetString(byteData);
			var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);

			//检测多个手机来回创建,然后又删除之后,楼层数据不能保证100%同步的问题
			if (roomTemp.FloorId != string.Empty && Config.Instance.Home.FloorDics.ContainsKey(roomTemp.FloorId) == false)
			{
			//未知楼层
			Config.Instance.Home.FloorDics[roomTemp.FloorId] = Language.StringByID(R.MyInternationalizationString.uUnKnownFloor);
			}
			}
			catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
			}
			}

			#endregion
			@@ -587,21 +619,25 @@
			/// </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);
			if (Config.Instance.Home.FloorDics.Count == 0)
			{
			return Lists;
			}
			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,6 +652,10 @@
			/// <returns></returns>
			public List<Room> GetRoomsByFloorIdAppendLoveRoom(string id)
			{
			if (Config.Instance.Home.FloorDics.Count == 0)
			{
			return Lists;
			}
			var r= Lists.FindAll((obj) => obj.FloorId == id);
			r.Insert(0, GetLoveRoom());
			return r;
			@@ -645,7 +685,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)
			@@ -659,7 +700,7 @@
			var room = this.GetRoomById(roomId);
			if (room != null)
			{
			room.AddDevice(device);
			room.AddDevice(device, saveRealRoom);
			}
			}

			@@ -748,7 +789,7 @@
			#region ◆ 添加设备________________________

			/// <summary>
			/// 添加设备
			/// 添加设备(此方法目前只给【我的喜爱】使用)
			/// </summary>
			/// <param name="deviceUIFilePath">Device UIF ile path.</param>
			public void AddDevice(string deviceUIFilePath)
			@@ -773,10 +814,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)
			{
			@@ -784,9 +826,6 @@
			}
			//设备信息保存到本地
			device.Save();

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

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

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

			@@ -847,6 +891,9 @@
			room.Save();
			//更改自动备份
			HdlAutoBackupLogic.AddOrEditorFile(room.FileName);

			//递归：删除掉以前的旧数据导致的多个房间的问题
			this.DeleteDevice(device);
			}

			#endregion
			@@ -983,7 +1030,7 @@
			return -1;
			}
			}


			var getSceneIdAllData = await ZigBee.Device.Scene.GetSceneNewIdAsync(sceneName);
			if (getSceneIdAllData == null \|\| getSceneIdAllData.getSceneIdData == null)
			{
			@@ -1194,7 +1241,6 @@
			Save();
			Global.DeleteFilebyHomeId(sceneUI.FileName);
			HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
			HdlAutoBackupLogic.AddOrEditorFile(FileName);
			}

			#endregion
			@@ -1469,6 +1515,6 @@
			}

			#endregion


			}
			}