~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -44,7 +44,7 @@
			{
			get
			{
			return GetFloorNameById(FloorId);
			return Config.Instance.Home.GetFloorNameById(FloorId);
			}
			}
			/// <summary>
			@@ -75,11 +75,36 @@
			/// 湿度传感器(设备主键)
			/// </summary>
			public string HumidityDevice = string.Empty;
			/// <summary>
			/// 温度
			/// </summary>
			public decimal Temperatrue;
			/// <summary>
			/// 湿度
			/// </summary>
			public decimal Humidity;

			/// <summary>
			/// 当前选择的房间
			/// </summary>
			private static Room m_CurrentRoom = null;
			/// <summary>
			/// 当前选择的房间
			/// </summary>
			public static Room CurrentRoom;
			[Newtonsoft.Json.JsonIgnore]
			public static Room CurrentRoom
			{
			get
			{
			if (m_CurrentRoom == null && Lists.Count > 0)
			{
			if (m_CurrentRoom == null) { m_CurrentRoom = Lists[0]; }
			return Lists[0];
			}
			return m_CurrentRoom;
			}
			set { m_CurrentRoom = value; }
			}

			/// <summary>
			/// 房间里所有的设备列表
			@@ -116,12 +141,6 @@
			public bool IsSharedRoom = false;

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

			/// <summary>
			/// 获取喜爱房间的所有设备路径
			/// </summary>
			/// <value>The love room device list.</value>
			@@ -134,17 +153,34 @@
			{
			return new List<string> { };
			}
			return GetLoveRoom().DeviceUIFilePathList;
			return CurrentRoom.GetLoveRoom().DeviceUIFilePathList;
			}
			}

			/// <summary>
			/// 所有房间的所有设备类型
			/// 先调用 GetAllRoomDeviceTypeList()
			/// </summary>
			/// <value>All room device type list.</value>
			[Newtonsoft.Json.JsonIgnore]
			public static List<DeviceType> AllRoomDeviceTypeList = new List<DeviceType> { };
			public static List<DeviceType> AllRoomDeviceTypeList
			{
			get
			{
			var typeList = new List<DeviceType> { };
			foreach (var deviceUI in AllRoomDeviceUIList)
			{
			if (deviceUI == null \|\| deviceUI.CommonDevice == null)
			{
			continue;
			}
			if (!typeList.Contains(deviceUI.CommonDevice.Type))
			{
			typeList.Add(deviceUI.CommonDevice.Type);
			}
			}
			return typeList;
			}
			}

			/// <summary>
			/// 获取所有房间的所有场景
			@@ -158,6 +194,10 @@
			var sceneList = new List<SceneUI> { };
			foreach (var r in Shared.Common.Room.Lists)
			{
			if(r.IsLove)
			{
			continue;
			}
			if (r.SceneUIList.Count == 0)
			{
			continue;
			@@ -174,6 +214,37 @@
			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.IsLove)
			{
			continue;
			}

			if (r.SceneUIFilePathList.Count == 0)
			{
			continue;
			}
			foreach (var path in r.SceneUIFilePathList)
			{
			pathList.Add(path);
			}
			}
			return pathList;
			}
			}

			/// <summary>
			/// 场景列表---不再序列化
			/// </summary>
			@@ -191,11 +262,41 @@

			/// <summary>
			/// 获取所有房间的所有设备
			/// 请先调用 GetAllRoomDeviceUIList()方法
			/// </summary>
			/// <value>All room device UIL ist.</value>
			[Newtonsoft.Json.JsonIgnore]
			public static List<DeviceUI> AllRoomDeviceUIList = new List<DeviceUI> { };
			public static List<DeviceUI> AllRoomDeviceUIList
			{
			get
			{
			List<DeviceUI> deviceList = new List<DeviceUI>();
			for (int i = 0; i < Lists.Count; i++)
			{
			var room = Lists[i];
			if (room.IsSharedRoom \|\| room.IsLove)
			{
			continue;
			}
			if (room.DeviceUIList.Count == 0)
			{
			continue;
			}
			for (int j = 0; j < room.DeviceUIList.Count; j++)
			{
			var device = room.DeviceUIList[j];
			if (device == null \|\| device.CommonDevice == null)
			{
			continue;
			}
			if (deviceList.Find((obj) => obj.FileName == device.FileName) == null)
			{
			deviceList.Add(device);
			}
			}
			}
			return deviceList;
			}
			}

			#endregion

			@@ -219,20 +320,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)
			{
			@@ -242,11 +339,27 @@
			{
			if (room.IsSharedRoom)
			{
			room.Name = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){room.Name}";
			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>
			@@ -254,7 +367,6 @@
			/// </summary>
			public static void RefreshAllRoomByLocation()
			{
			Lists.Clear();
			var homeTemp = Config.Instance.Home;
			homeTemp.RoomFilePathList.Clear();

			@@ -265,19 +377,48 @@
			if (listFile.Contains(fRoom) == true)
			{
			listFile.Remove(fRoom);
			homeTemp.AddRoomListFilePath(fRoom);
			homeTemp.RoomFilePathList.Add(fRoom);
			}

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

			homeTemp.Save(false);
			CanInitAllRoom = true;
			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
			@@ -307,6 +448,7 @@
			}
			Save();
			HdlAutoBackupLogic.AddOrEditorFile(room.FileName);
			CurrentRoom.RefreshRoomListView();
			return true;
			}

			@@ -327,8 +469,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;
			@@ -338,6 +505,9 @@
			Global.DeleteFilebyHomeId(roomFilePath);
			Lists.Remove(room);
			HdlAutoBackupLogic.DeleteFile(roomFilePath);

			CurrentRoom.RefreshRoomListView();

			return true;
			}

			@@ -349,7 +519,7 @@
			/// 获取喜爱房间
			/// </summary>
			/// <returns></returns>
			public static Room GetLoveRoom()
			public Room GetLoveRoom()
			{
			return CurrentRoom.GetRoomById(LoveRoomId);
			}
			@@ -382,8 +552,21 @@
			//设备（deviceUI）
			beforeRoom.DeviceUIList.Clear();
			foreach (var deviceFilePath in beforeRoom.DeviceUIFilePathList)
			{
			beforeRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(deviceFilePath));
			{
			var jsonInfo = Encoding.UTF8.GetString(Global.ReadFileByHomeId(deviceFilePath));
			var tempDeviceUI = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceUI>(jsonInfo);
			if (tempDeviceUI != null)
			{
			var delCommon = tempDeviceUIList.Find((obj) => obj.CommonDevice != null && tempDeviceUI.CommonDevice != null && obj.CommonDevice.Type == tempDeviceUI.CommonDevice.Type && obj.CommonDevice.CommonDeviceAddrEpoint == tempDeviceUI.CommonDevice.CommonDeviceAddrEpoint);
			if (delCommon != null)
			{
			beforeRoom.DeviceUIList.Add(delCommon);
			}
			else
			{
			beforeRoom.AddDevice(deviceFilePath);
			}
			}
			}
			//场景(SceneUI)
			beforeRoom.SceneUIList.Clear();
			@@ -446,7 +629,21 @@
			/// <param name="roomId">房间ID</param>
			public Room GetRoomById(string roomId)
			{
			if (string.IsNullOrEmpty(roomId))
			{
			return null;
			}
			return Lists.Find((obj) => obj.Id == roomId);
			}

			/// <summary>
			/// 根据房间名字，获取房间对象
			/// </summary>
			/// <returns>The room by name.</returns>
			/// <param name="roomName">房间名</param>
			public Room GetRoomByName(string roomName)
			{
			return Lists.Find((obj) => obj.Name == roomName);
			}

			/// <summary>
			@@ -477,11 +674,8 @@
			/// <param name="device">设备对象</param>
			public Room GetRoomByDevice(CommonDevice device)
			{
			var deviceUI = new DeviceUI { };
			deviceUI.DeviceAddr = device.DeviceAddr;
			deviceUI.DeviceEpoint = device.DeviceEpoint;

			return Lists.Find((obj) => obj.DeviceUIFilePathList.Contains(deviceUI.FileName));
			string deviceFile = device.FilePath;
			return Lists.Find((obj) => obj.IsLove == false && obj.DeviceUIFilePathList.Contains(deviceFile));
			}

			/// <summary>
			@@ -508,6 +702,10 @@
			{
			foreach (var r in Lists)
			{
			if(r.IsLove)
			{
			continue;
			}
			foreach (var scene in r.SceneUIList)
			{
			if (scene.Id == sceneId)
			@@ -519,6 +717,80 @@
			return null;
			}

			/// <summary>
			/// 获取当前楼层的房间
			/// </summary>
			/// <param name="id"></param>
			/// <returns></returns>
			public List<Room> GetRoomsByFloorId(string id)
			{
			try
			{
			if (Lists == null \|\| Lists.Count == 0 \|\| Lists.Count == 1)
			{
			return null;
			}
			if (Config.Instance.Home.FloorDics.Count == 0)
			{
			return Lists;
			}
			return Lists.FindAll((obj) => obj.FloorId == id);
			}
			catch(Exception ex)
			{
			System.Console.WriteLine(ex.Message);
			return null;
			}

			}
			/// <summary>
			/// 获取当前楼层的房间名称
			/// </summary>
			/// <param name="id"></param>
			/// <returns></returns>
			public List<string> GetRoomNamesByFloorId(string id)
			{
			List<string> names = new List<string> { };
			foreach (var r in Lists)
			{
			if (r.FloorId == id)
			{
			names.Add(r.Name);
			}
			}
			return names;
			}

			/// <summary>
			/// 获取当前楼层的房间(拼接了【常用】在第一位)
			/// </summary>
			/// <param name="id"></param>
			/// <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;
			}

			/// <summary>
			/// 获取当前楼层的房间(拼接了【常用】在第一位)
			/// </summary>
			/// <returns></returns>
			public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
			{
			if(Config.Instance.Home.FloorDics.Count==0)
			{
			return Lists;
			}
			var r = Lists.FindAll((obj) => obj.FloorId == Config.Instance.Home.CurrentFloorId);
			r.Insert(0, GetLoveRoom());
			return r;
			}

			#endregion

			@@ -529,7 +801,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)
			@@ -543,7 +816,7 @@
			var room = this.GetRoomById(roomId);
			if (room != null)
			{
			room.AddDevice(device);
			room.AddDevice(device, saveRealRoom);
			}
			}

			@@ -563,6 +836,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 ◆ 更新房间_________________________
			@@ -579,31 +871,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>
			/// 移动背景图片到住宅目录下
			@@ -632,7 +899,7 @@
			#region ◆ 添加设备________________________

			/// <summary>
			/// 添加设备
			/// 添加设备(此方法目前只给【我的喜爱】使用)
			/// </summary>
			/// <param name="deviceUIFilePath">Device UIF ile path.</param>
			public void AddDevice(string deviceUIFilePath)
			@@ -641,9 +908,8 @@
			{
			return;
			}
			var jsonInfo = Encoding.UTF8.GetString(Global.ReadFileByHomeId(deviceUIFilePath));
			var deviceUI = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceUI>(jsonInfo);
			if (null == deviceUI \|\| null == deviceUI.CommonDevice)
			var deviceUI = Common.LocalDevice.Current.GetDeviceUI(deviceUIFilePath);
			if (null == deviceUI.CommonDevice)
			{
			//当前对象数据无效
			return;
			@@ -658,10 +924,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)
			{
			@@ -670,10 +937,7 @@
			//设备信息保存到本地
			device.Save();

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

			DeviceUI deviceUI = Common.LocalDevice.Current.GetDeviceUI(device);
			var deviceUI = Common.LocalDevice.Current.GetDeviceUI(device);
			if (DeviceUIFilePathList.Contains(deviceUI.FileName) == false)
			{
			DeviceUIFilePathList.Add(deviceUI.FileName);
			@@ -681,15 +945,17 @@
			//保存到本地
			Save();

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

			#endregion

			#region ◆ 删除设备_________________________

			/// <summary>
			/// 删除功能-设备
			/// </summary>
			@@ -697,11 +963,10 @@
			public void DeleteDevice(string deviceUIFilePath)
			{
			if (deviceUIFilePath == null) return;
			if (DeviceUIFilePathList.Contains(deviceUIFilePath) && Global.IsExistsByHomeId(deviceUIFilePath))
			if (DeviceUIFilePathList.Contains(deviceUIFilePath))
			{
			DeviceUIFilePathList.Remove(deviceUIFilePath);
			DeviceUIList.RemoveAll((obj) => obj.FileName == deviceUIFilePath);
			HdlAutoBackupLogic.DeleteFile(deviceUIFilePath);
			Save();
			}
			}
			@@ -716,65 +981,57 @@
			{
			return;
			}
			DeviceUI deviceUI = new DeviceUI();
			deviceUI.DeviceAddr = device.DeviceAddr;
			deviceUI.DeviceEpoint = device.DeviceEpoint;

			//根据设备，获取所在的房间
			var room = this.GetRoomByDevice(device);
			if (room == null)
			{
			return;
			}
			string deviceFile = device.FilePath;
			//移除缓存
			if (room.DeviceUIFilePathList.Contains(deviceUI.FileName) == false)
			if (room.DeviceUIFilePathList.Contains(deviceFile) == false)
			{
			return;
			}
			room.DeviceUIFilePathList.Remove(deviceUI.FileName);
			room.DeviceUIFilePathList.Remove(deviceFile);

			room.DeviceUIList.RemoveAll((obj) => obj.FileName == deviceUI.FileName);
			room.DeviceUIList.RemoveAll((obj) => obj.FileName == deviceFile);
			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

			#region ◆ 获取设备_________________________

			/// <summary>
			/// 获取所有房间的所有设备
			/// </summary>
			public static void GetAllRoomDeviceUIList()
			{
			List<string> devicePathList = new List<string>();
			//所有房间的所有设备
			AllRoomDeviceUIList.Clear();
			foreach (var room in Shared.Common.Room.Lists)
			{
			if(room.IsSharedRoom)
			{
			continue;
			}
			if (room.DeviceUIList.Count == 0)
			{
			continue;
			}
			foreach (var device in room.DeviceUIList)
			{
			if (device == null \|\| device.CommonDevice == null)
			{
			continue;
			}
			if (!devicePathList.Contains(device.FileName))
			{
			AllRoomDeviceUIList.Add(device);
			devicePathList.Add(device.FileName);
			}
			}
			}
			}

			/// <summary>
			/// 根据设备获取它的UI对象，如果不存在则新建
			@@ -784,25 +1041,6 @@
			public DeviceUI GetDeviceUI(CommonDevice device)
			{
			return Common.LocalDevice.Current.GetDeviceUI(device);
			}

			/// <summary>
			/// 重新获取-所有房间的所有设备类型
			/// </summary>
			public static void GetAllRoomDeviceTypeList()
			{
			AllRoomDeviceTypeList.Clear();
			foreach (var deviceUI in AllRoomDeviceUIList)
			{
			if (deviceUI == null \|\| deviceUI.CommonDevice == null)
			{
			continue;
			}
			if (!AllRoomDeviceTypeList.Contains(deviceUI.CommonDevice.Type))
			{
			AllRoomDeviceTypeList.Add(deviceUI.CommonDevice.Type);
			}
			}
			}

			/// <summary>
			@@ -820,12 +1058,83 @@
			}
			listDevice.Add(device.CommonDevice);
			}
			if (listDevice.Count == 0)
			{
			return listDevice;
			}
			return Common.LocalDevice.Current.SortDevice(listDevice);
			return listDevice;
			}

			/// <summary>
			/// 获取房间设备类型
			/// </summary>
			/// <param name="room"></param>
			/// <returns></returns>
			public static List<DeviceType> GetdeviceTypes(Room room)
			{
			List<DeviceType> typeList = new List<DeviceType> { };
			foreach (var deviceUI in room.DeviceUIList)
			{
			if (deviceUI == null \|\| deviceUI.CommonDevice == null)
			{
			continue;
			}
			if (!typeList.Contains(deviceUI.CommonDevice.Type))
			{
			typeList.Add(deviceUI.CommonDevice.Type);
			}
			}
			return typeList;
			}

			/// <summary>
			/// 获取该类型的设备
			/// </summary>
			/// <param name="room"></param>
			/// <param name="deviceType"></param>
			/// <returns></returns>
			public static List<DeviceUI> GetDeviceUIs(Room room ,DeviceType deviceType)
			{
			List<DeviceUI> typeList = new List<DeviceUI> { };
			foreach (var deviceUI in room.DeviceUIList)
			{
			if (deviceUI == null \|\| deviceUI.CommonDevice == null)
			{
			continue;
			}
			if(deviceUI.CommonDevice.Type!=deviceType)
			{
			continue;
			}
			if (!typeList.Contains(deviceUI))
			{
			typeList.Add(deviceUI);
			}
			}
			return typeList;
			}

			/// <summary>
			/// 获取未分配区域设备
			/// </summary>
			/// <returns></returns>
			public List<DeviceUI> GetUnalloctedDeviceUIs()
			{
			List<DeviceUI> deviceUIs = new List<DeviceUI> { };
			var dList = AllRoomDeviceUIList;
			var commonDeviceList = Common.LocalDevice.Current.listAllDevice;

			foreach (var device in commonDeviceList)
			{
			if (dList.Find((obj) => obj.CommonDevice.DeviceEpoint == device.DeviceEpoint && obj.CommonDevice.DeviceAddr == device.DeviceAddr) == null)
			{
			deviceUIs.Add(Common.LocalDevice.Current.GetDeviceUI(device));
			}
			}
			if (deviceUIs.Count == 0)
			{
			return null;
			}
			return deviceUIs;
			}

			//public List<DeviceUI> GetUnalloctedDeviceUITypes

			#endregion

			@@ -839,27 +1148,23 @@
			/// <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)
			{
			if (AllRoomSceneUIList.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)
			{
			return 0;
			}
			var getSceneIdData = getSceneIdAllData.getSceneIdData;
			//循环相同报错
			foreach (var tempSceneUI in AllRoomSceneUIList)
			{
			if (tempSceneUI.Id == getSceneIdAllData.getSceneIdData.NewScenesId)
			{
			//场景已存在
			return -1;
			}
			}

			bool result = true;
			foreach (var common in commons)
			@@ -867,12 +1172,13 @@
			//添加新成员
			var addSceneMemberData = new ZigBee.Device.Scene.AddSceneMemberData
			{
			DeviceAddr = common.DeviceAddr,
			Type = common.Type,
			DeviceAddr = common.DeviceAddr,
			Epoint = common.Epoint,
			ScenesId = getSceneIdData.NewScenesId,
			TaskList = common.TaskList,
			DelayTime = common.DelayTime,
			MemberNumber=common.MemberNumber,
			ElseScenesId = common.ElseScenesId
			};
			//common.ScenesId = getSceneIdData.NewScenesId;
			@@ -891,26 +1197,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;
			@@ -922,17 +1220,24 @@
			/// <param name="scene">Scene.</param>
			public void AddScene(SceneUI scene)
			{
			var sceneUI = new SceneUI
			SceneUIList.Add(scene);
			SceneUIFilePathList.Add(scene.FileName);
			Save();
			}

			/// <summary>
			/// 删除场景
			/// </summary>
			/// <param name="scene"></param>
			public void DeleteScene(SceneUI scene)
			{
			var curScene = SceneUIList.Find((obj) => obj.Id == scene.Id);
			if (curScene == null)
			{
			Name = scene.Name,
			Id = scene.Id,
			IconPath = scene.IconPath,
			IconPathType = scene.IconPathType,
			AddSceneMemberDataList = scene.AddSceneMemberDataList
			};
			SceneUIList.Add(sceneUI);
			SceneUIFilePathList.Add(sceneUI.FileName);
			sceneUI.Save();
			return;
			}
			SceneUIList.Remove(curScene);
			SceneUIFilePathList.Remove(curScene.FileName);
			Save();
			}

			@@ -943,15 +1248,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;
			@@ -971,10 +1271,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;
			//移除成员返回结果
			@@ -1004,7 +1304,8 @@
			ScenesId = sceneUI.Id,
			TaskList = addCommon.TaskList,
			DelayTime = addCommon.DelayTime,
			ElseScenesId = addCommon.ElseScenesId
			ElseScenesId = addCommon.ElseScenesId,
			MemberNumber=addCommon.MemberNumber
			};
			//添加新成员返回结果
			var addSceneMemberResponseAllData = await ZigBee.Device.Scene.AddSceneMemberAsync(addSceneMemberData);
			@@ -1025,9 +1326,61 @@
			{
			sceneUI.AddSceneMemberDataList = addCommons;
			sceneUI.Save();
			if (IsLove == false)
			{
			var curScene = Common.Room.CurrentRoom.GetLoveRoom().SceneUIList.Find((obj) => obj.Id == sceneUI.Id);
			if (curScene != null)
			{
			curScene.Name = sceneUI.Name;
			curScene.IconPath = sceneUI.IconPath;
			curScene.IconPathType = sceneUI.IconPathType;
			curScene.AddSceneMemberDataList = sceneUI.AddSceneMemberDataList;
			curScene.SceneDelayTime = sceneUI.SceneDelayTime;
			curScene.Save(false);
			Common.Room.CurrentRoom.GetLoveRoom().Save();
			}
			}
			return 1;
			}
			return 0;
			}

			/// <summary>
			/// 设置、同步延时时间
			/// </summary>
			/// <param name="scene"></param>
			public void ModifySceneDelayTime(SceneUI scene)
			{
			if (IsLove)
			{
			foreach (var r in Lists)
			{
			if (r.IsLove \|\| r.SceneUIList.Count == 0)
			{
			continue;
			}
			foreach (var sce in r.SceneUIList)
			{
			if (sce.Id == scene.Id)
			{
			sce.SceneDelayTime = scene.SceneDelayTime;
			sce.Save(false);
			r.Save(false);
			break;
			}
			}
			}
			}
			else
			{
			var curScene = Common.Room.CurrentRoom.GetLoveRoom().SceneUIList.Find((obj) => obj.Id == scene.Id);
			if (curScene != null)
			{
			curScene.SceneDelayTime = scene.SceneDelayTime;
			curScene.Save(false);
			Common.Room.CurrentRoom.GetLoveRoom().Save(false);
			}
			}
			}

			#endregion
			@@ -1044,12 +1397,30 @@
			{
			return;
			}

			if (sceneUI.IconPathType == 1 \|\| sceneUI.IconPathType == 2)
			{
			if (Global.IsExistsByHomeId(sceneUI.IconPath))
			{
			Global.DeleteFilebyHomeId(sceneUI.IconPath);
			HdlAutoBackupLogic.DeleteFile(sceneUI.IconPath);
			}
			}

			if (IsLove == false)
			{
			if (CurrentRoom.GetLoveRoom().SceneUIList.Find((obj) => obj.Id == sceneUI.Id) != null)
			{
			CurrentRoom.GetLoveRoom().DeleteScene(sceneUI);
			}
			}

			SceneUIList.Remove(sceneUI);
			SceneUIFilePathList.Remove(sceneUI.FileName);
			Save();

			Global.DeleteFilebyHomeId(sceneUI.FileName);
			HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
			HdlAutoBackupLogic.AddOrEditorFile(FileName);
			}

			#endregion
			@@ -1065,6 +1436,10 @@
			{
			foreach (var r in Lists)
			{
			if (r.IsLove)
			{
			continue;
			}
			foreach (var sceneUI in r.SceneUIList)
			{
			if (sceneUI.Id == sceneId)
			@@ -1076,6 +1451,89 @@
			return null;
			}

			/// <summary>
			/// 获取该楼层所有场景
			/// </summary>
			/// <param name="floorId"></param>
			/// <returns></returns>
			public List<SceneUI> GetSameFloorScenes(string floorId)
			{
			List<SceneUI> sceneUIs = new List<SceneUI> { };
			var rooms= CurrentRoom.GetRoomsByFloorId(floorId);
			foreach(var r in rooms)
			{
			sceneUIs.AddRange(r.SceneUIList);
			}
			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 ◆ 刷新场景_________________________
			@@ -1085,51 +1543,45 @@
			/// </summary>
			public async System.Threading.Tasks.Task<bool> RefreshSceneUIList()
			{
			return false;
			//System.Console.WriteLine($"开始请求网关场景**{DateTime.Now.ToString("yyMMdd hhmmss fff")}***");
			//bool result = true;
			//var sceneList = await ZigBee.Device.Scene.GetSceneListAsync();
			//System.Console.WriteLine($"结束请求网关场景**{DateTime.Now.ToString("yyMMdd hhmmss fff")}***");
			//if (sceneList == null)
			//{
			// return false;
			//}
			//List<int> sceneIDList = new List<int> { };
			//System.Console.WriteLine($"开始本地场景**{DateTime.Now.ToString("yyMMdd hhmmss fff")}***");
			//foreach (var scene in sceneList)
			//{
			// if (scene == null)
			// {
			// continue;
			// }
			// sceneIDList.Add(scene.ScenesId);
			//}
			//foreach(var r in Lists)
			//{
			// if(r.SceneUIList==null \|\| r.SceneUIList.Count==0)
			// {
			// continue;
			// }
			// foreach(var rScene in r.SceneUIList)
			// {
			// if(rScene==null)
			// {
			// continue;
			// }
			// //var scene = sceneList.Find((obj) => rScene.ScenesId == obj.ScenesId);
			// if(sceneIDList.Contains(rScene.ScenesId)==false)
			// {
			// var removeResult = r.SceneUIList.Remove(rScene);
			// r.Save();
			// if (removeResult == false)
			// {
			// result = false;
			// }
			// }
			// }
			//}
			//System.Console.WriteLine($"结束本地场景**{DateTime.Now.ToString("yyMMdd hhmmss fff")}***");
			//return result;
			bool result = true;
			var sceneList = await ZigBee.Device.Scene.GetSceneListAsync();
			if (sceneList == null)
			{
			return false;
			}
			List<int> sceneIDList = new List<int> { };
			foreach (var scene in sceneList)
			{
			if (scene == null)
			{
			continue;
			}
			sceneIDList.Add(scene.ScenesId);
			}
			foreach (var r in Lists)
			{
			if(r.IsLove)
			{
			continue;
			}
			if (r.SceneUIList == null \|\| r.SceneUIList.Count == 0)
			{
			continue;
			}
			foreach (var rScene in r.SceneUIList)
			{
			if (rScene == null)
			{
			continue;
			}
			if (sceneIDList.Contains(rScene.Id) == false)
			{
			r.RemoveScene(rScene);
			result = true;
			}
			}
			}
			return result;
			}

			#endregion
			@@ -1311,32 +1763,5 @@

			#endregion

			#region ◆ 楼层___________________________

			/// <summary>
			/// 获取楼层名称
			/// </summary>
			/// <param name="floorId"></param>
			/// <returns></returns>
			public string GetFloorNameById(string floorId)
			{
			if (Config.Instance.Home.FloorDics.Count == 0)
			{
			return null;
			}

			foreach (var floor in Config.Instance.Home.FloorDics)
			{
			if (floorId == floor.Key)
			{
			return floor.Value;
			}
			}
			return null;
			}

			#endregion


			}
			}