~wjc/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;
			}
			}
			@@ -808,6 +715,15 @@
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show();
			}
			/// <summary>
			/// HidenFloor
			/// </summary>
			/// <param name="statu"></param>
			private void HidenFloor(bool statu)
			{
			selectFloorBtn.Visible = !statu;
			floorBtn.Visible = !statu;
			}

			#endregion

			@@ -820,14 +736,17 @@
			functionSceneAutoBodyView.RemoveAll();
			if (functionBtn.IsSelected)
			{
			HidenFloor(false);
			ShowFunction();
			}
			else if (sceneBtn.IsSelected)
			{
			HidenFloor(false);
			ShowScene();
			}
			else if (automationBtn.IsSelected)
			{
			HidenFloor(true);
			ShowAutotion();

			}
			@@ -1001,8 +920,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) =>
			@@ -1021,6 +941,7 @@
			{
			light.SwitchControl(0);
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1038,11 +959,30 @@

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var lightControl = new Phone.Device.Light.LightControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A开关)
			{
			var lightControl = new Phone.Device.Light.OnOffControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			}
			else if (deviceUI.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(deviceUI, room);
			}
			else
			{
			var lightControl = new Phone.Device.Light.LightControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			}
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			@@ -1089,7 +1029,7 @@

			var deviceTypeRowLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(127 + 35),
			Height = Application.GetRealHeight(129 + 35),
			LineColor = ZigbeeColor.Current.GXCBackgroundColor,
			Tag = deviceUI
			};
			@@ -1098,8 +1038,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) =>
			@@ -1109,8 +1050,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);
			}
			@@ -1118,6 +1059,7 @@
			{
			airSwitch.SwitchControl(0);
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1135,10 +1077,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);
			};

			@@ -1197,8 +1139,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) =>
			@@ -1208,8 +1151,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);
			}
			@@ -1217,6 +1160,7 @@
			{
			dimmableLight.SwitchControl(0);
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1238,7 +1182,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);
			};

			@@ -1303,10 +1247,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) =>
			@@ -1325,6 +1271,7 @@
			{
			ac.Close();
			}
			deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
			//控制延时回调
			DeviceUI.SendCommandDelayAction(deviceUI.CommonDevice, () =>
			{
			@@ -1370,6 +1317,7 @@
			UserHomeView.ReadStatus(rollerShade, () =>
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			rollerShade.ReadWcdCurrentPositionLiftPercentage();
			});
			}
			else
			@@ -1378,23 +1326,44 @@
			if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			rollerShade.ReadWcdCurrentPositionLiftPercentage();
			}
			}


			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()
			{
			@@ -1412,42 +1381,19 @@
			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
			{


			}
			}
			};
			@@ -2040,7 +1986,7 @@
			//自动化
			Automationview(logicScrolView);
			CommonPage.Loading.Hide();


			}

			/// <summary>
			@@ -2648,6 +2594,6 @@

			#endregion



			}
			}