~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -36,7 +36,7 @@
			/// 楼层Id
			/// 新增时使用Guid
			/// </summary>
			public string FloorId = "Floor1";
			public string FloorId = string.Empty;
			/// <summary>
			/// 楼层名称
			/// </summary>
			@@ -44,7 +44,7 @@
			{
			get
			{
			return GetFloorNameById(FloorId);
			return Config.Instance.Home.GetFloorNameById(FloorId);
			}
			}
			/// <summary>
			@@ -67,10 +67,43 @@
			/// </summary>
			public Dictionary<string, string> FloorList = new Dictionary<string, string> { };

			/// <summary>
			/// 温度传感器(设备主键)
			/// </summary>
			public string TemperatrueDevice = string.Empty;
			/// <summary>
			/// 湿度传感器(设备主键)
			/// </summary>
			public string HumidityDevice = string.Empty;
			/// <summary>
			/// 温度
			/// </summary>
			public double Temperatrue;
			/// <summary>
			/// 湿度
			/// </summary>
			public double 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)
			{
			return Lists[0];
			}
			return m_CurrentRoom;
			}
			set { m_CurrentRoom = value; }
			}

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

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

			/// <summary>
			/// 获取喜爱房间的所有设备路径
			/// </summary>
			/// <value>The love room device list.</value>
			@@ -125,17 +152,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>
			/// 获取所有房间的所有场景
			@@ -165,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>
			@@ -182,11 +252,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)
			{
			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

			@@ -210,20 +310,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)
			{
			@@ -233,11 +329,26 @@
			{
			if (room.IsSharedRoom)
			{
			room.Name = $"({Language.StringByID(R.MyInternationalizationString.Shared)}){room.Name}";
			room.Name = $"{room.Name}";
			}
			Lists.Add(room);

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

			RefreshRoomListView();
			}

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

			/// <summary>
			@@ -267,7 +378,6 @@
			}
			}
			homeTemp.Save(false);
			CanInitAllRoom = true;
			InitAllRoom();
			}

			@@ -340,7 +450,7 @@
			/// 获取喜爱房间
			/// </summary>
			/// <returns></returns>
			public static Room GetLoveRoom()
			public Room GetLoveRoom()
			{
			return CurrentRoom.GetRoomById(LoveRoomId);
			}
			@@ -450,7 +560,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>
			@@ -481,11 +605,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>
			@@ -523,6 +644,67 @@
			return null;
			}

			/// <summary>
			/// 获取当前楼层的房间
			/// </summary>
			/// <param name="id"></param>
			/// <returns></returns>
			public List<Room> GetRoomsByFloorId(string 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)
			{
			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

			@@ -533,7 +715,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)
			@@ -547,7 +730,7 @@
			var room = this.GetRoomById(roomId);
			if (room != null)
			{
			room.AddDevice(device);
			room.AddDevice(device, saveRealRoom);
			}
			}

			@@ -636,7 +819,7 @@
			#region ◆ 添加设备________________________

			/// <summary>
			/// 添加设备
			/// 添加设备(此方法目前只给【我的喜爱】使用)
			/// </summary>
			/// <param name="deviceUIFilePath">Device UIF ile path.</param>
			public void AddDevice(string deviceUIFilePath)
			@@ -645,9 +828,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;
			@@ -662,10 +844,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)
			{
			@@ -674,10 +857,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);
			@@ -687,13 +867,17 @@

			//添加自动备份
			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>
			@@ -701,11 +885,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();
			}
			}
			@@ -720,24 +903,21 @@
			{
			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);
			@@ -746,39 +926,6 @@
			#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对象，如果不存在则新建
			@@ -790,24 +937,102 @@
			return Common.LocalDevice.Current.GetDeviceUI(device);
			}

			/// <summary>
			/// 获取当前房间下的全部设备
			/// </summary>
			/// <returns></returns>
			public List<CommonDevice> GetRoomListDevice()
			{
			var listDevice = new List<CommonDevice>();
			foreach (var device in this.DeviceUIList)
			{
			if (device == null \|\| device.CommonDevice == null)
			{
			continue;
			}
			listDevice.Add(device.CommonDevice);
			}
			return listDevice;
			}

			/// <summary>
			/// 重新获取-所有房间的所有设备类型
			/// 获取房间设备类型
			/// </summary>
			public static void GetAllRoomDeviceTypeList()
			/// <param name="room"></param>
			/// <returns></returns>
			public static List<DeviceType> GetdeviceTypes(Room room)
			{
			AllRoomDeviceTypeList.Clear();
			foreach (var deviceUI in AllRoomDeviceUIList)
			List<DeviceType> typeList = new List<DeviceType> { };
			foreach (var deviceUI in room.DeviceUIList)
			{
			if (deviceUI == null \|\| deviceUI.CommonDevice == null)
			{
			continue;
			}
			if (!AllRoomDeviceTypeList.Contains(deviceUI.CommonDevice.Type))
			if (!typeList.Contains(deviceUI.CommonDevice.Type))
			{
			AllRoomDeviceTypeList.Add(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;

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

			//public List<DeviceUI> GetUnalloctedDeviceUITypes

			#endregion

			@@ -823,25 +1048,21 @@
			/// <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)
			{
			if (AllRoomSceneUIList.Find(s => s.Name == sceneName) != null)
			var scenes = GetSceneUIsByFloorId(FloorId);
			if(scenes!=null && scenes.Count>0)
			{
			return -1;
			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)
			@@ -849,12 +1070,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;
			@@ -904,17 +1126,30 @@
			/// <param name="scene">Scene.</param>
			public void AddScene(SceneUI scene)
			{
			var sceneUI = new SceneUI
			{
			Name = scene.Name,
			Id = scene.Id,
			IconPath = scene.IconPath,
			IconPathType = scene.IconPathType,
			AddSceneMemberDataList = scene.AddSceneMemberDataList
			};
			SceneUIList.Add(sceneUI);
			SceneUIFilePathList.Add(sceneUI.FileName);
			sceneUI.Save();
			//var sceneUI = new SceneUI
			//{
			// Name = scene.Name,
			// Id = scene.Id,
			// IconPath = scene.IconPath,
			// IconPathType = scene.IconPathType,
			// AddSceneMemberDataList = scene.AddSceneMemberDataList
			//};
			SceneUIList.Add(scene);
			SceneUIFilePathList.Add(scene.FileName);
			scene.Save();
			Save();
			}

			/// <summary>
			/// 删除场景
			/// </summary>
			/// <param name="scene"></param>
			public void DeleteScene(SceneUI scene)
			{
			//scene.IsCollected = false;
			scene.Save();
			SceneUIList.Remove(scene);
			SceneUIFilePathList.Remove(scene.FileName);
			Save();
			}

			@@ -986,7 +1221,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);
			@@ -1031,7 +1267,6 @@
			Save();
			Global.DeleteFilebyHomeId(sceneUI.FileName);
			HdlAutoBackupLogic.DeleteFile(sceneUI.FileName);
			HdlAutoBackupLogic.AddOrEditorFile(FileName);
			}

			#endregion
			@@ -1056,6 +1291,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
			@@ -1282,6 +1600,8 @@
			//克隆属性
			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;
			@@ -1291,32 +1611,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


			}
			}