~wjc/HomeApp.git

			@@ -69,7 +69,7 @@

			/// <summary>
			/// 温度传感器(设备主键)
			/// </summary>
			/// </summary>
			public string TemperatrueDevice = string.Empty;
			/// <summary>
			/// 湿度传感器(设备主键)
			@@ -78,11 +78,11 @@
			/// <summary>
			/// 温度
			/// </summary>
			public double Temperatrue;
			public decimal Temperatrue;
			/// <summary>
			/// 湿度
			/// </summary>
			public double Humidity;
			public decimal Humidity;

			/// <summary>
			/// 当前选择的房间
			@@ -332,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>
			@@ -445,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;
			@@ -456,6 +494,9 @@
			Global.DeleteFilebyHomeId(roomFilePath);
			Lists.Remove(room);
			HdlAutoBackupLogic.DeleteFile(roomFilePath);

			CurrentRoom.RefreshRoomListView();

			return true;
			}

			@@ -754,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 ◆ 更新房间_________________________
			@@ -770,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>
			/// 移动背景图片到住宅目录下
			@@ -930,6 +965,31 @@
			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

			#region ◆ 获取设备_________________________
			@@ -1053,16 +1113,16 @@
			/// <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)
			@@ -1102,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;
			@@ -1167,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;
			@@ -1195,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;
			//移除成员返回结果
			@@ -1272,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);
			}