~xm/HomeApp.git

			@@ -1,13 +1,13 @@
			using System;
			using System.Collections.Generic;
			using System.Timers;
			using Shared.Common;
			using Shared.Phone.Device.AC;
			using ZigBee.Device;
			using Shared.Phone.Device.CommonForm;
			using Shared.Phone.UserCenter.DoorLock;
			using System.Timers;
			using Shared.Phone.Device.DeviceLogic;
			using Shared.Phone.UserCenter;
			using Shared.Phone.UserCenter.DoorLock;
			using ZigBee.Device;

			namespace Shared.Phone.UserView
			{
			@@ -919,6 +919,7 @@
			/// </summary>
			private void ShowFunction()
			{
			functionSceneBodyView.RemoveAll();
			//选择功能--直接从房间的devicelist中获取
			var deviceList = Room.CurrentRoom.DeviceUIList;
			if (deviceList == null)
			@@ -1011,18 +1012,17 @@
			})
			{ IsBackground = true }.Start();

			var lightView = new FunctionMainView(xx, yy);
			lightView.Tag = device;
			itemView.AddChidren(lightView);
			lightView.Init();
			lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(rollerShade.DeviceEpointName);
			//lightView.SetStatu(true);
			lightView.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage == 100;
			lightView.SetCollect(true);
			var functionView = new FunctionMainView(xx, yy);
			functionView.Tag = device;
			itemView.AddChidren(functionView);
			functionView.Init();
			functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			functionView.SetStatuText(device.GetDeviceStatu());
			functionView.SetDeviceName(rollerShade.DeviceEpointName);
			functionView.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage == 100;
			functionView.SetCollect(true);

			lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			functionView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			{
			(sender as Button).IsSelected = !(sender as Button).IsSelected;
			if ((sender as Button).IsSelected)
			@@ -1079,18 +1079,21 @@
			}
			};

			lightView.CardBG.MouseUpEventHandler += (sender, e) =>
			functionView.CardBG.MouseUpEventHandler += (sender, e) =>
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
			UserView.HomePage.Instance.AddChidren(rollerShadeControl);
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			//rollerShadeControl.action = RefreshBodyView;
			rollerShadeControl.Show(device, Room.CurrentRoom);
			rollerShadeControl.action += (curDev, curRoom) =>
			{
			ReFreshEditDeviceAction(device, curRoom, functionView);
			};
			};

			lightView.CollectButton.MouseUpEventHandler += collectionEvent;
			functionView.CollectButton.MouseUpEventHandler += collectionEvent;
			}
			}
			else if (device.CommonDevice.Type == DeviceType.OnOffOutput)
			@@ -1119,27 +1122,26 @@
			})
			{ IsBackground = true }.Start();

			var lightView = new FunctionMainView(xx, yy);
			itemView.AddChidren(lightView);
			lightView.Init();
			lightView.Tag = device;
			lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			lightView.IsSelected = light.OnOffStatus == 1;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			var functionView = new FunctionMainView(xx, yy);
			itemView.AddChidren(functionView);
			functionView.Init();
			functionView.Tag = device;
			functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			functionView.SetStatuText(device.GetDeviceStatu());
			functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			functionView.IsSelected = light.OnOffStatus == 1;
			functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));

			var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
			if (dev == null)
			if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
			{
			lightView.CollectButton.IsSelected = false;
			functionView.CollectButton.IsSelected = false;
			}
			else
			{
			lightView.CollectButton.IsSelected = true;
			functionView.CollectButton.IsSelected = true;
			}

			lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			functionView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			{
			(sender as Button).IsSelected = !(sender as Button).IsSelected;
			if ((sender as Button).IsSelected)
			@@ -1196,36 +1198,21 @@
			}
			};

			lightView.CardBG.MouseUpEventHandler += (sender, e) =>
			functionView.CardBG.MouseUpEventHandler += (sender, e) =>
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			if (device.CommonDevice.DfunctionType == DeviceFunctionType.A开关)

			var lightControl = new Phone.Device.Light.OnOffControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			lightControl.Show(device, Room.CurrentRoom);
			lightControl.action += (curDev, curRoom) =>
			{
			var lightControl = new Phone.Device.Light.OnOffControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(device, Room.CurrentRoom);
			}
			else if (device.CommonDevice.DfunctionType == DeviceFunctionType.A插座)
			{
			var lightControl = new Phone.Device.Light.PlugControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(device, Room.CurrentRoom);
			}
			else
			{
			var lightControl = new Phone.Device.Light.LightControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(device, Room.CurrentRoom);
			}
			ReFreshEditDeviceAction(device, curRoom, functionView);
			};
			};

			lightView.CollectButton.MouseUpEventHandler += collectionEvent;
			functionView.CollectButton.MouseUpEventHandler += collectionEvent;
			}
			}
			else if (device.CommonDevice.Type == DeviceType.AirSwitch)
			@@ -1254,18 +1241,17 @@
			})
			{ IsBackground = true }.Start();

			var lightView = new FunctionMainView(xx, yy);
			itemView.AddChidren(lightView);
			lightView.Init();
			lightView.Tag = device;
			lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(airSwitch.DeviceEpointName);
			//lightView.SetStatu(true);
			lightView.IsSelected = airSwitch.OnOffStatus == 1;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			var functionView = new FunctionMainView(xx, yy);
			itemView.AddChidren(functionView);
			functionView.Init();
			functionView.Tag = device;
			functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			functionView.SetStatuText(device.GetDeviceStatu());
			functionView.SetDeviceName(airSwitch.DeviceEpointName);
			functionView.IsSelected = airSwitch.OnOffStatus == 1;
			functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom( device.FileName));

			lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			functionView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			{
			(sender as Button).IsSelected = !(sender as Button).IsSelected;
			if ((sender as Button).IsSelected)
			@@ -1322,17 +1308,21 @@
			}
			};

			lightView.CardBG.MouseUpEventHandler += (sender, e) =>
			functionView.CardBG.MouseUpEventHandler += (sender, e) =>
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			var lightControl = new Phone.Device.Light.AirSwitchControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(device, Room.CurrentRoom);
			lightControl.action += (curDev, curRoom) =>
			{
			ReFreshEditDeviceAction(device, curRoom, functionView);
			};

			};

			lightView.CollectButton.MouseUpEventHandler += collectionEvent;
			functionView.CollectButton.MouseUpEventHandler += collectionEvent;
			}
			}
			else if (device.CommonDevice.Type == DeviceType.Thermostat)
			@@ -1361,17 +1351,17 @@
			})
			{ IsBackground = true }.Start();

			var lightView = new FunctionMainView(xx, yy);
			itemView.AddChidren(lightView);
			lightView.Init();
			lightView.Tag = device;
			lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			lightView.IsSelected = ac.currentSystemMode != 0;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			var functionView = new FunctionMainView(xx, yy);
			itemView.AddChidren(functionView);
			functionView.Init();
			functionView.Tag = device;
			functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			functionView.SetStatuText(device.GetDeviceStatu());
			functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			functionView.IsSelected = ac.currentSystemMode != 0;
			functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));

			lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			functionView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			{
			(sender as Button).IsSelected = !(sender as Button).IsSelected;
			if ((sender as Button).IsSelected)
			@@ -1428,17 +1418,20 @@
			}
			};

			lightView.CardBG.MouseUpEventHandler += (sender, e) =>
			functionView.CardBG.MouseUpEventHandler += (sender, e) =>
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			var lightControl = new Phone.Device.AC.ACControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(device, Room.CurrentRoom);
			lightControl.action += (curDev, curRoom) =>
			{
			ReFreshEditDeviceAction(device, curRoom, functionView);
			};
			};

			lightView.CollectButton.MouseUpEventHandler += collectionEvent;
			functionView.CollectButton.MouseUpEventHandler += collectionEvent;
			}
			}
			else if (device.CommonDevice.Type == DeviceType.DimmableLight)
			@@ -1469,27 +1462,26 @@
			})
			{ IsBackground = true }.Start();

			var lightView = new FunctionMainView(xx, yy);
			itemView.AddChidren(lightView);
			lightView.Init();
			lightView.Tag = device;
			lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			lightView.IsSelected = dimmableLight.OnOffStatus == 1;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			var functionView = new FunctionMainView(xx, yy);
			itemView.AddChidren(functionView);
			functionView.Init();
			functionView.Tag = device;
			functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			functionView.SetStatuText(device.GetDeviceStatu());
			functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			functionView.IsSelected = dimmableLight.OnOffStatus == 1;
			functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));

			var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
			if (dev == null)
			if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
			{
			lightView.CollectButton.IsSelected = false;
			functionView.CollectButton.IsSelected = false;
			}
			else
			{
			lightView.CollectButton.IsSelected = true;
			functionView.CollectButton.IsSelected = true;
			}

			lightView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			functionView.SwitchButton.MouseUpEventHandler += (sender, e) =>
			{
			(sender as Button).IsSelected = !(sender as Button).IsSelected;
			if ((sender as Button).IsSelected)
			@@ -1546,16 +1538,19 @@
			}
			};

			lightView.CardBG.MouseUpEventHandler += (sender, e) =>
			functionView.CardBG.MouseUpEventHandler += (sender, e) =>
			{
			CommonPage.Instance.IsDrawerLockMode = true;
			var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
			UserView.HomePage.Instance.AddChidren(dimmableLightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//dimmableLightControl.action = RefreshBodyView;
			dimmableLightControl.Show(device, Room.CurrentRoom);
			dimmableLightControl.action += (curDev, curRoom) =>
			{
			ReFreshEditDeviceAction(device, curRoom, functionView);
			};
			};
			lightView.CollectButton.MouseUpEventHandler += collectionEvent;
			functionView.CollectButton.MouseUpEventHandler += collectionEvent;
			}
			}
			else if (device.CommonDevice.Type == DeviceType.IASZone)
			@@ -1571,10 +1566,9 @@
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			lightView.IsSelected = ias.iASInfo?.Alarm1 == 1;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
			lightView.CanControl(false);
			var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
			if (dev == null)
			if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
			{
			lightView.CollectButton.IsSelected = false;
			}
			@@ -1632,10 +1626,9 @@
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			lightView.IsSelected = false;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
			lightView.CanControl(false);
			var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
			if (dev == null)
			if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
			{
			lightView.CollectButton.IsSelected = false;
			}
			@@ -1658,11 +1651,10 @@
			lightView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			lightView.IsSelected = dimmableLight.IsOnline == 1;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			lightView.IsSelected = false;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
			lightView.CanControl(false);
			var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
			if (dev == null)
			if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
			{
			lightView.CollectButton.IsSelected = false;
			}
			@@ -1691,11 +1683,10 @@
			lightView.SetStatuText(device.GetDeviceStatu());
			lightView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			lightView.CanControl(false);
			lightView.IsSelected = device.CommonDevice.IsOnline == 1;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(Room.CurrentRoom, device.FileName));
			//lightView.IsSelected = device.CommonDevice.IsOnline == 1;
			lightView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));

			var dev = Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
			if (dev == null)
			if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
			{
			lightView.CollectButton.IsSelected = false;
			}
			@@ -1713,6 +1704,40 @@
			});
			//})
			//{ IsBackground = true }.Start();
			}
			}
			}

			/// <summary>
			/// ReFreshEditDeviceAction
			/// </summary>
			/// <param name="device"></param>
			/// <param name="curRoom"></param>
			/// <param name="functionView"></param>
			private void ReFreshEditDeviceAction(DeviceUI device, Common.Room curRoom, FunctionMainView functionView)
			{
			if (Common.Room.CurrentRoom.IsLove)
			{
			functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			if (Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
			{
			ShowFunction();
			}
			}
			else
			{
			if (curRoom.Id != Common.Room.CurrentRoom.Id)
			{

			Common.Room.CurrentRoom.DeleteDevice(device.FileName);
			ShowFunction();
			}
			else
			{
			functionView.SetDeviceImage(device.IconPath, device.OnlineIconPath);
			functionView.SetDeviceName(device.CommonDevice.DeviceEpointName);
			functionView.SetCollect(Room.CurrentRoom.IsCollectInRoom(device.FileName));
			}
			}
			}
			@@ -1741,7 +1766,7 @@
			Height = Application.GetRealHeight(200),
			Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
			TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
			TextAlignment = TextAlignment.Center,
			TextAlignment=TextAlignment.Center,
			IsMoreLines = true
			};
			functionSceneBodyView.AddChidren(noScenceTip);
			@@ -1752,6 +1777,7 @@
			/// </summary>
			private void ShowScene()
			{
			functionSceneBodyView.RemoveAll();
			//选择场景
			var sceneList = Room.CurrentRoom.SceneUIList;
			if (sceneList == null)