~wjc/HomeApp.git

			@@ -75,6 +75,14 @@
			/// 湿度传感器(设备主键)
			/// </summary>
			public string HumidityDevice = string.Empty;
			/// <summary>
			/// 温度
			/// </summary>
			public decimal Temperatrue;
			/// <summary>
			/// 湿度
			/// </summary>
			public decimal Humidity;

			/// <summary>
			/// 当前选择的房间
			@@ -201,6 +209,32 @@
			return sceneList;
			}
			}

			/// <summary>
			/// 获取所有房间的所有场景路径
			/// </summary>
			/// <value>All room scene UIL ist.</value>
			[Newtonsoft.Json.JsonIgnore]
			public List<string> AllRoomSceneUIFilepathList
			{
			get
			{
			var pathList = new List<string> { };
			foreach (var r in Lists)
			{
			if (r.SceneUIFilePathList.Count == 0)
			{
			continue;
			}
			foreach (var path in r.SceneUIFilePathList)
			{
			pathList.Add(path);
			}
			}
			return pathList;
			}
			}

			/// <summary>
			/// 场景列表---不再序列化
			/// </summary>
			@@ -298,10 +332,23 @@
			room.Name = $"{room.Name}";
			}
			Lists.Add(room);


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

			CurrentRoom.RefreshRoomListView();
			}

			/// <summary>
			/// 刷新房间视图列表
			/// </summary>
			public void RefreshRoomListView()
			{
			Application.RunOnMainThread(() =>
			{
			Phone.Device.Room.RoomManagement.Instance.Show();
			});
			}

			/// <summary>
			@@ -323,15 +370,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
			@@ -381,8 +458,33 @@
			//删除来自拍照或者系统图库的房间背景图片
			if (room.BackgroundImageType == 1 \|\| room.BackgroundImageType == 2)
			{
			DeleteBackGroundIamageFilebyHomeId(room.BackgroundImage);
			//删除掉原来的自定义图片
			if (Global.IsExistsByHomeId(room.BackgroundImage) == true)
			{
			Global.DeleteFilebyHomeId(room.BackgroundImage);
			//删除备份
			HdlAutoBackupLogic.DeleteFile(room.BackgroundImage);
			}
			}
			//我的喜爱
			var loveRoom = this.GetLoveRoom();
			if (loveRoom != null)
			{
			//移除我的喜爱里面的设备
			for (int i = 0; i < room.DeviceUIFilePathList.Count; i++)
			{
			loveRoom.DeviceUIFilePathList.Remove(room.DeviceUIFilePathList[i]);
			loveRoom.DeviceUIList.RemoveAll((obj) => { return room.DeviceUIFilePathList[i] == obj.FileName; });
			}
			//移除我的喜爱里面的场景
			for (int i = 0; i < room.SceneUIFilePathList.Count; i++)
			{
			loveRoom.SceneUIFilePathList.Remove(room.SceneUIFilePathList[i]);
			loveRoom.SceneUIList.RemoveAll((obj) => { return room.SceneUIFilePathList[i] == obj.FileName; });
			}
			loveRoom.Save(false);
			}

			if (Global.IsExistsByHomeId(roomFilePath) == false)
			{
			return false;
			@@ -392,6 +494,9 @@
			Global.DeleteFilebyHomeId(roomFilePath);
			Lists.Remove(room);
			HdlAutoBackupLogic.DeleteFile(roomFilePath);

			CurrentRoom.RefreshRoomListView();

			return true;
			}

			@@ -589,21 +694,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);
			}
			@@ -618,6 +727,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;
			@@ -682,6 +795,25 @@
			return false;
			}

			/// <summary>
			/// 获取房间所在区域
			/// 楼层,房间名
			/// </summary>
			/// <returns></returns>
			public string GetZoneName()
			{
			if (string.IsNullOrEmpty(FloorId))
			{
			return Name;
			}
			var floorName = Config.Instance.Home.GetFloorNameById(FloorId);
			if (floorName == null)
			{
			return Name;
			}
			return $"{floorName},{Name}";
			}

			#endregion

			#region ◆ 更新房间_________________________
			@@ -698,31 +830,6 @@
			#endregion

			#region ◆ 房间背景图的相关___________________
			/// <summary>
			/// 删除背景图片
			/// </summary>
			/// <param name="fileName">fileName实际上包含了住宅路劲如住宅/文件名.</param>
			public static void DeleteBackGroundIamageFilebyHomeId(string fileName)
			{
			if (fileName == null)
			{
			return;
			}
			var pathLists = fileName.Split('/');
			if (pathLists == null \|\| pathLists.Count() < 9 \|\| pathLists[8] == null)
			{
			return;
			}
			var path = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
			if (!Global.IsExistsByHomeId(pathLists[8]))
			{
			return;
			}
			//删除本地图片
			System.IO.File.Delete(path);
			//删除备份
			Phone.UserCenter.HdlAutoBackupLogic.DeleteFile(pathLists[8]);
			}

			/// <summary>
			/// 移动背景图片到住宅目录下
			@@ -853,6 +960,34 @@
			room.Save();
			//更改自动备份
			HdlAutoBackupLogic.AddOrEditorFile(room.FileName);

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

			/// <summary>
			/// 删除我的喜爱的设备
			/// </summary>
			/// <param name="device">要删除的设备对象</param>
			public void DeleteLoveDevice(CommonDevice device)
			{
			if (device == null)
			{
			return;
			}
			//我的喜爱
			var loveRoom = this.GetLoveRoom();
			if (loveRoom != null)
			{
			string deviceFile = device.FilePath;
			//移除缓存
			if (loveRoom.DeviceUIFilePathList.Contains(deviceFile) == false)
			{
			return;
			}
			loveRoom.DeviceUIFilePathList.Remove(deviceFile);
			loveRoom.DeviceUIList.RemoveAll((obj) => obj.FileName == deviceFile);
			}
			}

			#endregion
			@@ -937,35 +1072,34 @@
			}

			/// <summary>
			/// 获取该楼层的场景
			/// 获取未分配区域设备
			/// </summary>
			/// <param name="floorId"></param>
			/// <returns></returns>
			public List<SceneUI> GetSceneUIsByFloorId(string floorId)
			public List<DeviceUI> GetUnalloctedDeviceUIs()
			{
			var rooms = GetRoomsByFloorId(floorId);
			if (rooms == null)
			List<DeviceUI> deviceUIs = new List<DeviceUI> { };
			var dList = AllRoomDeviceUIList;
			var commonDeviceList = Common.LocalDevice.Current.listAllDevice;

			if (dList.Count == 0)
			{
			return null;
			}
			var sceneList = new List<SceneUI> { };
			foreach (var r in rooms)
			foreach (var device in commonDeviceList)
			{
			if (r.SceneUIList.Count == 0)
			if (dList.Find((obj) => obj.CommonDevice == device) == null)
			{
			continue;
			}
			foreach (var sceneUI in r.SceneUIList)
			{
			if (sceneUI == null)
			{
			continue;
			}
			sceneList.Add(sceneUI);
			deviceUIs.Add(Common.LocalDevice.Current.GetDeviceUI(device));
			}
			}
			return sceneList;
			if (deviceUIs.Count == 0)
			{
			return null;
			}
			return deviceUIs;
			}

			//public List<DeviceUI> GetUnalloctedDeviceUITypes

			#endregion

			@@ -979,17 +1113,17 @@
			/// <param name="sceneIconPath">背景图片，不包含住宅路径如果iconPathType=1或者2 需要拼接住宅变成住宅/sceneIconPath</param>
			/// <param name="commons">Commons.</param>
			/// <param name="iconPathType">I场景背景图片来源类型图片来源 0--本地图库 1--拍照 2--系统图库默认0</param>
			public async System.Threading.Tasks.Task<int> AddScene(string sceneName, string sceneIconPath, List<ZigBee.Device.Scene.AddSceneMemberData> commons, int iconPathType = 0)
			public async System.Threading.Tasks.Task<int> AddScene(string sceneName, string sceneIconPath, List<ZigBee.Device.Scene.AddSceneMemberData> commons, int iconPathType)
			{
			var scenes = GetSceneUIsByFloorId(FloorId);
			if(scenes!=null && scenes.Count>0)
			{
			if (scenes.Find(s => s.Name == sceneName) != null)
			{
			return -1;
			}
			}

			//var scenes = GetSceneUIsByFloorId(FloorId);
			//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)
			{
			@@ -1028,26 +1162,18 @@
			//加入成功
			if (result)
			{
			//iconPathType=0 直接传值， iconPathType=1和iconPathType=2需要拼接住宅路径
			var fullPath = sceneIconPath;
			if (iconPathType == 1 \|\| iconPathType == 2)
			{
			Common.Room.CurrentRoom.MoveBackGroundIamageFileToDirectory(sceneIconPath, $"{Config.Instance.FullPath}/{sceneIconPath}");
			fullPath = $"{Config.Instance.FullPath}/{sceneIconPath}";
			}
			var sceneUI = new SceneUI
			{
			Name = sceneName,
			Id = getSceneIdData.NewScenesId,
			IconPath = fullPath,
			IconPath = sceneIconPath,
			IconPathType = iconPathType,
			AddSceneMemberDataList= commons
			};
			sceneUI.Save();
			SceneUIList.Add(sceneUI);
			SceneUIFilePathList.Add(sceneUI.FileName);
			sceneUI.Save();
			Save();
			HdlAutoBackupLogic.AddOrEditorFile(sceneUI.FileName);
			return 1;
			}
			return 0;
			@@ -1093,15 +1219,10 @@
			/// <summary>
			/// 是否是收藏设备
			/// </summary>
			/// <param name="room"></param>
			/// <param name="filePath"></param>
			/// <returns></returns>
			public bool IsCollectInRoom(Room room,string filePath)
			public bool IsCollectInRoom(string filePath)
			{
			if(room.IsLove)
			{
			return true;
			}
			if (GetLoveRoom().DeviceUIFilePathList.Find((obj) => obj == filePath) == null)
			{
			return false;
			@@ -1121,10 +1242,10 @@
			/// <param name="addCommons">Add commons.</param>
			public async System.Threading.Tasks.Task<int> ModifyScene(SceneUI sceneUI, Scene.SceneRemoveMemberData sceneRemoveMemberData, List<Scene.AddSceneMemberData> addCommons)
			{
			if (AllRoomSceneUIList.Find(s => s.Name == sceneUI.Name) == null)
			{
			return 0;
			}
			//if (AllRoomSceneUIList.Find(s => s.Name == sceneUI.Name) == null)
			//{
			// return 0;
			//}

			bool result = true;
			//移除成员返回结果
			@@ -1198,6 +1319,13 @@
			SceneUIList.Remove(sceneUI);
			SceneUIFilePathList.Remove(sceneUI.FileName);
			Save();
			if (IsLove == false)
			{
			if (CurrentRoom.GetLoveRoom().SceneUIList.Find((obj) => obj.Id == sceneUI.Id) != null)
			{
			CurrentRoom.GetLoveRoom().DeleteScene(sceneUI);
			}
			}
			Global.DeleteFilebyHomeId(sceneUI.FileName);
			HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
			}
			@@ -1225,6 +1353,7 @@
			}
			return null;
			}

			/// <summary>
			/// 获取该楼层所有场景
			/// </summary>
			@@ -1240,6 +1369,74 @@
			}
			return sceneUIs;
			}

			/// <summary>
			/// 获取该楼层的场景
			/// </summary>
			/// <param name="floorId"></param>
			/// <returns></returns>
			public List<SceneUI> GetSceneUIsByFloorId(string floorId)
			{
			var rooms = GetRoomsByFloorId(floorId);
			if (rooms == null)
			{
			return null;
			}
			var sceneList = new List<SceneUI> { };
			foreach (var r in rooms)
			{
			if (r.SceneUIList.Count == 0)
			{
			continue;
			}
			foreach (var sceneUI in r.SceneUIList)
			{
			if (sceneUI == null)
			{
			continue;
			}
			sceneList.Add(sceneUI);
			}
			}
			return sceneList;
			}

			/// <summary>
			/// 获取未分配区域场景
			/// </summary>
			/// <returns></returns>
			public List<SceneUI> GetUnalloctedScenes()
			{
			List<SceneUI> sceneUIs = new List<SceneUI> { };
			var sList = AllRoomSceneUIFilepathList;

			List<string> sfile = new List<string> { };
			foreach (var path in Global.FileListByHomeId())
			{
			if (path.StartsWith("Scene_", StringComparison.Ordinal))
			{
			sfile.Add(path);
			}
			}
			foreach (var path in sfile)
			{
			if (sList.Find((obj) => obj == path) == null)
			{
			var jsonInfo = Encoding.UTF8.GetString(Global.ReadFileByHomeId(path));
			var tempSceneUI = Newtonsoft.Json.JsonConvert.DeserializeObject<SceneUI>(jsonInfo);
			if (tempSceneUI != null)
			{
			sceneUIs.Add(tempSceneUI);
			}
			}
			}
			if (sceneUIs.Count == 0)
			{
			return null;
			}
			return sceneUIs;
			}

			#endregion

			#region ◆ 刷新场景_________________________
			@@ -1474,6 +1671,6 @@
			}

			#endregion


			}
			}