~xm/HomeApp.git

			@@ -166,45 +166,25 @@
			{
			var light = deviceUI.CommonDevice as ToggleLight;
			light.DeviceStatusReport = common.DeviceStatusReport;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			//记录、更新状态
			if (light.DeviceStatusReport.AttriBute == null \|\| light.DeviceStatusReport.AttriBute.Count == 0)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
			{
			//记录、更新状态
			if (light.DeviceStatusReport.AttriBute == null \|\| light.DeviceStatusReport.AttriBute.Count == 0)
			{
			continue;
			}
			light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
			(tempView as Button).IsSelected = light.OnOffStatus == 1;
			//记录回复时间
			light.LastDateTime = DateTime.Now;
			}
			continue;
			}
			light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;

			row.SetStatu(light.OnOffStatus == 1);
			row.SetStatuText(deviceUI.GetDeviceStatu());
			//记录回复时间
			light.LastDateTime = DateTime.Now;
			}
			if (common.DeviceStatusReport.CluterID == 3)
			{
			var light = deviceUI.CommonDevice as ToggleLight;
			light.IsOnline = 1;
			//记录回复时间
			light.LastDateTime = DateTime.Now;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = light.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.IsOnline = 1;
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row.SetStatu(true);
			}
			break;

			@@ -214,66 +194,55 @@
			{
			var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
			airSwitch.DeviceStatusReport = common.DeviceStatusReport;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			//记录、更新状态
			if (airSwitch.DeviceStatusReport.AttriBute == null \|\| airSwitch.DeviceStatusReport.AttriBute.Count == 0)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
			{
			//记录、更新状态
			if (airSwitch.DeviceStatusReport.AttriBute == null \|\| airSwitch.DeviceStatusReport.AttriBute.Count == 0)
			{
			return;
			}
			airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
			(tempView as Button).IsSelected = airSwitch.OnOffStatus == 1;
			//记录回复时间
			airSwitch.LastDateTime = DateTime.Now;
			}
			return;
			}
			airSwitch.OnOffStatus = airSwitch.DeviceStatusReport.AttriBute[0].AttriButeData;
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row.SetStatu(airSwitch.OnOffStatus == 1);
			row.SetStatuText(deviceUI.GetDeviceStatu());
			//记录回复时间
			airSwitch.LastDateTime = DateTime.Now;
			}
			if (common.DeviceStatusReport.CluterID == 3)
			{
			var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
			airSwitch.IsOnline = 1;
			//记录回复时间
			airSwitch.LastDateTime = DateTime.Now;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = airSwitch.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.IsOnline = 1;
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row.SetStatu(true);
			}
			break;
			case DeviceType.WindowCoveringDevice:

			if (common.DeviceStatusReport.CluterID == 258)
			{
			if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			{
			//窗帘类型
			var rollerShade = deviceUI.CommonDevice as Rollershade;
			rollerShade.DeviceStatusReport = common.DeviceStatusReport;
			rollerShade.WcdType = common.DeviceStatusReport.AttriBute[0].AttriButeData;
			rollerShade.LastDateTime = DateTime.Now;
			}
			if (common.DeviceStatusReport.AttriBute[0].AttributeId == 8)
			{
			var row = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
			//窗帘百分比
			var rollerShade = deviceUI.CommonDevice as Rollershade;
			rollerShade.DeviceStatusReport = common.DeviceStatusReport;
			rollerShade.WcdCurrentPositionLiftPercentage = common.DeviceStatusReport.AttriBute[0].AttriButeData;
			row.SetStatuText($"{Language.StringByID(R.MyInternationalizationString.Current)} { deviceUI.GetDeviceStatu()}");
			rollerShade.LastDateTime = DateTime.Now;
			}
			}
			if (common.DeviceStatusReport.CluterID == 3)
			{
			var rollerShape = deviceUI.CommonDevice as Rollershade;
			//记录回复时间
			rollerShape.LastDateTime = DateTime.Now;
			rollerShape.IsOnline = 1;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = rollerShape.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.IsOnline = 1;
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			var row = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
			row.SetStatu(true);
			}
			break;

			@@ -360,47 +329,27 @@
			//调光灯功能
			if (common.DeviceStatusReport.CluterID == 6)
			{
			var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
			var dimmableLight = deviceUI.CommonDevice as DimmableLight;
			dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			//记录、更新状态
			if (dimmableLight.DeviceStatusReport.AttriBute == null \|\| dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_OnOffStatus)
			{
			//记录、更新状态
			if (dimmableLight.DeviceStatusReport.AttriBute == null \|\| dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
			{
			return;
			}
			dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
			(tempView as Button).IsSelected = dimmableLight.OnOffStatus == 1;
			//记录回复时间
			dimmableLight.LastDateTime = DateTime.Now;
			}
			continue;
			}
			dimmableLight.OnOffStatus = dimmableLight.DeviceStatusReport.AttriBute[0].AttriButeData;
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;

			row.SetStatu(dimmableLight.OnOffStatus == 1);
			row.SetStatuText(deviceUI.GetDeviceStatu());
			//记录回复时间
			dimmableLight.LastDateTime = DateTime.Now;
			}
			if (common.DeviceStatusReport.CluterID == 3)
			{
			var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
			dimmableLight.IsOnline = 1;
			//记录回复时间
			dimmableLight.LastDateTime = DateTime.Now;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = dimmableLight.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.IsOnline = 1;
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row.SetStatu(true);
			}
			break;
			}
			@@ -433,77 +382,35 @@
			switch (deviceUI.CommonDevice.Type)
			{
			case DeviceType.OnOffOutput:
			var light = deviceUI.CommonDevice as ToggleLight;
			light.IsOnline = (common as ToggleLight).IsOnline;
			//记录回复时间
			light.LastDateTime = DateTime.Now;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = light.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.IsOnline = common.IsOnline;
			var row = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			break;
			case DeviceType.AirSwitch:
			var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
			airSwitch.IsOnline = (common as ZigBee.Device.AirSwitch).IsOnline;
			//记录回复时间
			airSwitch.LastDateTime = DateTime.Now;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = airSwitch.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.IsOnline = common.IsOnline;
			var row1 = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row1.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			break;
			case DeviceType.WindowCoveringDevice:
			var rollerShape = deviceUI.CommonDevice as Rollershade;
			//记录回复时间
			rollerShape.LastDateTime = DateTime.Now;
			rollerShape.IsOnline = (common as Rollershade).IsOnline;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = rollerShape.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			deviceUI.CommonDevice.IsOnline = common.IsOnline;
			var row2 = rowLayout.GetChildren(0) as CategoryFunctionForWinRow;
			row2.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
			break;

			case DeviceType.DimmableLight:
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			deviceUI.CommonDevice.IsOnline = common.IsOnline;
			var row3 = rowLayout.GetChildren(0) as CategoryFunctionRow;
			row3.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
			break;
			case DeviceType.Thermostat:
			var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
			//记录回复时间
			ac.LastDateTime = DateTime.Now;
			ac.IsOnline = (common as ZigBee.Device.AC).IsOnline;
			for (int j = 0; j < rowLayout.ChildrenCount; j++)
			{
			var tempView = rowLayout.GetChildren(j);
			if (tempView.Tag == null)
			{
			continue;
			}
			if (tempView.Tag.ToString() == deviceStatus_Online)
			{
			(tempView as Button).IsSelected = ac.IsOnline == 1;
			}
			}
			deviceUI.CommonDevice.LastDateTime = DateTime.Now;
			deviceUI.CommonDevice.IsOnline = common.IsOnline;
			//var row4 = rowLayout.GetChildren(0) as CategoryFunctionRow;
			//row4.SetStatu(deviceUI.CommonDevice.IsOnline == 1);
			break;
			}
			}
			@@ -746,7 +653,12 @@
			/// <param name="sender">Sender.</param>
			/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
			private void AutomationBtn_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
			{
			{
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			functionBtn.IsSelected = false;
			sceneBtn.IsSelected = false;
			automationBtn.IsSelected = true;
			@@ -994,8 +906,9 @@
			var deviceRow = new CategoryFunctionRow(0, 35);
			deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			deviceRow.SetStatu(light.IsOnline == 1);
			deviceRow.SetZoneText(deviceUI.GetZone());
			deviceRow.SetOnLineStatu(light.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.SetStatu(light.OnOffStatus == 1);
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			@@ -1014,6 +927,7 @@
			{
			light.SwitchControl(0);
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1034,7 +948,7 @@
			var lightControl = new Phone.Device.Light.LightControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			lightControl.action = RefreshBodyView;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			};

			@@ -1082,7 +996,7 @@

			var deviceTypeRowLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(127 + 35),
			Height = Application.GetRealHeight(129 + 35),
			LineColor = ZigbeeColor.Current.GXCBackgroundColor,
			Tag = deviceUI
			};
			@@ -1091,8 +1005,9 @@
			var deviceRow = new CategoryFunctionRow(0, 35);
			deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			deviceRow.SetStatu(airSwitch.IsOnline == 1);
			deviceRow.SetZoneText(deviceUI.GetZone());
			deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
			deviceRow.SetStatu(airSwitch.OnOffStatus == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			@@ -1102,8 +1017,8 @@
			zbGateway.ReportAction += UpdateDeviceControllStatu;
			AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

			(send2 as CommonForm.SelectedStatuButton).IsSelected = !(send2 as CommonForm.SelectedStatuButton).IsSelected;
			if ((send2 as CommonForm.SelectedStatuButton).IsSelected)
			(send2 as Button).IsSelected = !(send2 as Button).IsSelected;
			if ((send2 as Button).IsSelected)
			{
			airSwitch.SwitchControl(1);
			}
			@@ -1111,6 +1026,7 @@
			{
			airSwitch.SwitchControl(0);
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1128,10 +1044,10 @@

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var lightControl = new Phone.Device.Light.LightControl();
			var lightControl = new Phone.Device.Light.AirSwitchControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			lightControl.action = RefreshBodyView;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			};

			@@ -1190,8 +1106,9 @@
			var deviceRow = new CategoryFunctionRow(0, 35);
			deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			deviceRow.SetStatu(dimmableLight.IsOnline == 1);
			deviceRow.SetZoneText(deviceUI.GetZone());
			deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.SetStatu(dimmableLight.OnOffStatus == 1);
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			@@ -1201,8 +1118,8 @@
			zbGateway.ReportAction += UpdateDeviceControllStatu;
			AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

			(send2 as CommonForm.SelectedStatuButton).IsSelected = !(send2 as CommonForm.SelectedStatuButton).IsSelected;
			if ((send2 as CommonForm.SelectedStatuButton).IsSelected)
			(send2 as Button).IsSelected = !(send2 as Button).IsSelected;
			if ((send2 as Button).IsSelected)
			{
			dimmableLight.SwitchControl(1);
			}
			@@ -1210,6 +1127,7 @@
			{
			dimmableLight.SwitchControl(0);
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1231,7 +1149,7 @@
			UserView.HomePage.Instance.AddChidren(dimmableLightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			dimmableLightControl.action = RefreshBodyView;
			//dimmableLightControl.action = RefreshBodyView;
			dimmableLightControl.Show(deviceUI, room);
			};

			@@ -1296,10 +1214,12 @@
			};
			deviceListScrolView.AddChidren(deviceTypeRowLayout);

			var deviceRow = new FunctionRow(0, 35);
			var deviceRow = new CategoryFunctionRow(0, 35);
			deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			deviceRow.SetStatu(ac.IsOnline == 1);
			deviceRow.SetOnLineStatu(ac.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.SetStatu(ac.currentSystemMode != 1);
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			@@ -1318,6 +1238,7 @@
			{
			ac.Close();
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1377,17 +1298,37 @@

			var deviceTypeRowLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(127 + 35),
			LineColor = ZigbeeColor.Current.GXCLineColor,
			Height = Application.GetRealHeight(129 + 35),
			LineColor = ZigbeeColor.Current.GXCBackgroundColor,
			Tag = deviceUI
			};
			deviceListScrolView.AddChidren(deviceTypeRowLayout);

			var deviceRow = new FunctionRow(0, 35);
			deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
			var deviceRow = new CategoryFunctionForWinRow(0, 35);
			deviceRow.Init(deviceUI);
			deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
			deviceRow.SetStatu(rollerShade.IsOnline == 1);
			deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			deviceRow.SetStatu(rollerShade.WcdCurrentPositionLiftPercentage != 0);
			deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
			deviceTypeRowLayout.AddChidren(deviceRow);

			if (rollerShade.WcdType == -1)
			{
			CommonPage.Loading.Start();
			new System.Threading.Thread(() =>
			{
			Rollershade.ReadWcdTypeAction(rollerShade, () =>
			{
			Application.RunOnMainThread(() =>
			{
			deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
			CommonPage.Loading.Hide();
			});
			});
			})
			{ IsBackground = true }.Start();
			}

			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			@@ -1405,37 +1346,14 @@
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;


			deviceRow.SwitchBtn.MouseUpEventHandler += (sender, e) =>
			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			zbGateway = deviceUI.CommonDevice.Gateway;
			sendedControlCommand = false;
			zbGateway.ReportAction += UpdateDeviceControllStatu;
			AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

			(sender as CommonForm.SelectedStatuButton).IsSelected = !(sender as CommonForm.SelectedStatuButton).IsSelected;
			if ((sender as CommonForm.SelectedStatuButton).IsSelected)
			{
			rollerShade.CurtainUpDownStopControl(0);
			}
			else
			{
			rollerShade.CurtainUpDownStopControl(1);
			}

			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			if (Parent == null)
			{
			return;
			}
			RemoveUpdateControlDeviceStatuAction(zbGateway);
			if (sendedControlCommand == false)
			{
			DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
			}
			});
			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(deviceUI, room);
			};
			}
			else
			@@ -1463,7 +1381,7 @@
			typeRowLayout.AddChidren(functionTypeIMG);

			functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;



			if (deviceType == room.DeviceUIList[0].CommonDevice.Type)
			{
			@@ -1854,7 +1772,6 @@
			{

			functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

			var bjFrameLayout = new FrameLayout
			{
			Width = Application.GetRealWidth(1080 - 58),
			@@ -1987,12 +1904,7 @@
			}
			else
			{
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			Common.Logic.CurrentLogic.LogicType = 2;

			Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
			Logic.TemplatePage templatePage = new Logic.TemplatePage();
			Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
			@@ -2011,7 +1923,7 @@
			Yheight = 0;
			}
			logicScrolView.Y = scenehorizontalScrol.Bottom + Yheight;
			logicScrolView.Height = functionSceneBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
			logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
			Automationview(logicScrolView);
			};

			@@ -2037,6 +1949,7 @@
			//自动化
			Automationview(logicScrolView);
			CommonPage.Loading.Hide();

			}

			/// <summary>
			@@ -2048,32 +1961,26 @@
			refresview.RemoveAll();
			foreach (var logic in Common.Logic.LogicList)
			{
			var bjRow = new RowLayout
			{
			Width = Application.GetRealWidth(1080 - 58),
			Height = Application.GetRealHeight(220),
			LineColor = ZigbeeColor.Current.LogicBackgroundColor,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,

			};
			refresview.AddChidren(bjRow);

			var logicRowlayout = new RowLayout
			{
			Y = Application.GetRealHeight(220 - 190),
			Height = Application.GetRealHeight(190),
			Width = Application.GetRealWidth(1080 - 58 - 46),
			LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
			X = Application.GetRealWidth(46),
			Height = Application.GetRealHeight(190 + 30),
			Width = Application.GetRealWidth(1080),
			LineColor = ZigbeeColor.Current.LogicBackgroundColor,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			};
			bjRow.AddChidren(logicRowlayout);
			refresview.AddChidren(logicRowlayout);



			var logicnameBtn = new Button
			{
			Height = Application.GetRealHeight(58),
			Width = Application.GetRealWidth(350),
			Text = logic.LogicName,
			X = Application.GetRealWidth(12),
			X = Application.GetRealWidth(12 + 46),
			Y = Application.GetRealHeight(30),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			};
			@@ -2086,8 +1993,8 @@
			Height = Application.GetMinRealAverage(63),
			UnSelectedImagePath = "ZigeeLogic/logicclose.png",
			SelectedImagePath = "ZigeeLogic/logicopen.png",
			X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
			Y = Application.GetRealHeight(58 + 30 + 9),
			X = logicRowlayout.Width - Application.GetRealWidth(104 + 58 + 58),
			Y = Application.GetRealHeight(58 + 30 + 9 + 30),
			};
			logicRowlayout.AddChidren(logicswitchBtn);

			@@ -2131,11 +2038,6 @@
			logicRowlayout.AddRightView(edit);
			edit.MouseUpEventHandler += (sender, e) =>
			{
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			Common.Logic.CurrentLogic = logic;
			var logicCommunalPage = new Logic.LogicCommunalPage();
			HomePage.Instance.AddChidren(logicCommunalPage);
			@@ -2169,91 +2071,32 @@
			alert.Show();

			};

			}


			}

			#region ◆ 控制状态_________________________

			/// <summary>
			/// 显示设备控制状态
			/// </summary>
			/// <param name="command">Command.</param>
			/// <param name="objValue">Object value.</param>
			private void UpdateDeviceControllStatu(string command, object objValue)
			{
			if (command != "DeviceDefaultAck" \|\| objValue == null)
			{
			return;
			}
			var tempDevice = (CommonDevice)objValue;
			if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == tempDevice.DeviceEpoint && obj.DeviceAddr == tempDevice.DeviceAddr))
			{
			return;
			}
			//标记已经发送控制命令到网关
			sendedControlCommand = true;
			//DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
			}

			/// <summary>
			/// 移除全部更新控制设备的action
			/// </summary>
			private void RemoveAllUpdateControlDeviceStatuAction()
			{
			foreach (var gateway in zbGatewayList)
			{
			//移除action
			if (gateway != null)
			var line = new Button
			{
			gateway.ReportAction -= UpdateDeviceControllStatu;
			}
			Y = Application.GetRealHeight(215),
			Height = Application.GetRealHeight(5),
			Width = Application.GetRealWidth(1080 - 58),
			BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
			X = Application.GetRealWidth(58),
			};
			logicRowlayout.AddChidren(line);
			}
			}

			}
			/// <summary>
			/// 移除单个控制设备的更新状态action
			/// 显示图标的颜色
			/// </summary>
			/// <param name="gateway">Gateway.</param>
			private void RemoveUpdateControlDeviceStatuAction(ZbGateway gateway)
			{
			//移除action
			if (gateway != null)
			{
			gateway.ReportAction -= UpdateDeviceControllStatu;
			}
			}

			/// <summary>
			/// 添加需要监控回调状态的网关和设备
			/// </summary>
			/// <param name="gatewayList">Gateway list.</param>
			/// <param name="gateway">Gateway.</param>
			/// <param name="deviceList">Device list.</param>
			/// <param name="common">Common.</param>
			private void AddZbGateway(List<ZbGateway> gatewayList, ZbGateway gateway, List<CommonDevice> deviceList, CommonDevice common)
			{
			if (null == gatewayList.Find((obj) => obj.getGatewayBaseInfo.gwID == gateway.getGatewayBaseInfo.gwID))
			{
			gatewayList.Add(gateway);
			}
			if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == common.DeviceEpoint && obj.DeviceAddr == common.DeviceAddr))
			{
			commonDeviceList.Add(common);
			}
			}

			#endregion

			/// <param name="logic"></param>
			/// <param name="logicRowlayout"></param>
			/// <param name="intvalue"></param>
			private void StatusColor(Common.Logic logic, RowLayout logicRowlayout, int intvalue)
			{

			var logictimeBtn = new Button
			{
			Height = Application.GetRealHeight(58),
			Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350),
			Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350 + 58),
			Y = Application.GetRealHeight(30),
			X = Application.GetRealWidth(365),
			TextAlignment = TextAlignment.CenterRight,
			TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
			@@ -2544,8 +2387,8 @@
			{
			Width = Application.GetRealWidth(82),
			Height = Application.GetRealHeight(82),
			X = Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
			Y = Application.GetRealHeight(58 + 30),
			X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
			Y = Application.GetRealHeight(58 + 30 + 30),
			Radius = (uint)Application.GetRealHeight(41),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			@@ -2563,7 +2406,7 @@
			var connectIconBtn = new Button
			{
			Y = typebjBtn.Y + Application.GetRealHeight(35),
			X = Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
			X = Application.GetRealWidth(58) + Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
			Width = Application.GetRealWidth(48),
			Height = Application.GetRealHeight(15),
			UnSelectedImagePath = "ZigeeLogic/connect.png",
			@@ -2641,5 +2484,79 @@
			}
			}
			#endregion

			#region ◆ 控制状态_________________________

			/// <summary>
			/// 显示设备控制状态
			/// </summary>
			/// <param name="command">Command.</param>
			/// <param name="objValue">Object value.</param>
			private void UpdateDeviceControllStatu(string command, object objValue)
			{
			if (command != "DeviceDefaultAck" \|\| objValue == null)
			{
			return;
			}
			var tempDevice = (CommonDevice)objValue;
			if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == tempDevice.DeviceEpoint && obj.DeviceAddr == tempDevice.DeviceAddr))
			{
			return;
			}
			//标记已经发送控制命令到网关
			sendedControlCommand = true;
			//DeviceUI.ShowStatuTip(R.MyInternationalizationString.Success);
			}

			/// <summary>
			/// 移除全部更新控制设备的action
			/// </summary>
			private void RemoveAllUpdateControlDeviceStatuAction()
			{
			foreach (var gateway in zbGatewayList)
			{
			//移除action
			if (gateway != null)
			{
			gateway.ReportAction -= UpdateDeviceControllStatu;
			}
			}
			}

			/// <summary>
			/// 移除单个控制设备的更新状态action
			/// </summary>
			/// <param name="gateway">Gateway.</param>
			private void RemoveUpdateControlDeviceStatuAction(ZbGateway gateway)
			{
			//移除action
			if (gateway != null)
			{
			gateway.ReportAction -= UpdateDeviceControllStatu;
			}
			}

			/// <summary>
			/// 添加需要监控回调状态的网关和设备
			/// </summary>
			/// <param name="gatewayList">Gateway list.</param>
			/// <param name="gateway">Gateway.</param>
			/// <param name="deviceList">Device list.</param>
			/// <param name="common">Common.</param>
			private void AddZbGateway(List<ZbGateway> gatewayList, ZbGateway gateway, List<CommonDevice> deviceList, CommonDevice common)
			{
			if (null == gatewayList.Find((obj) => obj.getGatewayBaseInfo.gwID == gateway.getGatewayBaseInfo.gwID))
			{
			gatewayList.Add(gateway);
			}
			if (null == commonDeviceList.Find((obj) => obj.DeviceEpoint == common.DeviceEpoint && obj.DeviceAddr == common.DeviceAddr))
			{
			commonDeviceList.Add(common);
			}
			}

			#endregion


			}
			}