~xm/HomeApp.git

			@@ -543,7 +543,7 @@
			/// <param name="selectedBtn">选中那个界面 0--功能 1--场景 2--自动化 </param>
			public void Show(int selectedBtn = 1)
			{


			ZbGateway.StatusList.Add(this);
			RemoveAll();

			@@ -585,7 +585,7 @@
			var midFL = new FrameLayout
			{
			Y = topView.Bottom,
			Height = Application.GetRealHeight(CommonPage.AppRealHeight - CommonPage.TabbarHeight) - topView.Bottom,
			Height = Application.GetRealHeight(1549),
			BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
			};
			AddChidren(midFL);
			@@ -596,18 +596,17 @@
			BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
			};
			midFL.AddChidren(functionSceneAutoBG);
			//功能
			functionBtn = new ButtonLineForm(CommonFormResouce.X_Left, 34, 150, 68);
			functionSceneAutoBG.AddChidren(functionBtn);
			functionBtn.Init();
			functionBtn.SetTitle(R.MyInternationalizationString.Function);

			//场景
			sceneBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 + 20, 34, 150, 68);
			sceneBtn = new ButtonLineForm(CommonFormResouce.X_Left, 34, 150, 68);
			functionSceneAutoBG.AddChidren(sceneBtn);
			sceneBtn.Init();
			sceneBtn.SetTitle(R.MyInternationalizationString.Scence);

			//功能
			functionBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 + 20, 34, 150, 68);
			functionSceneAutoBG.AddChidren(functionBtn);
			functionBtn.Init();
			functionBtn.SetTitle(R.MyInternationalizationString.Function);
			//自动化
			automationBtn = new ButtonLineForm(CommonFormResouce.X_Left + 150 * 2 + 20, 34, 150, 68);
			automationBtn.Init();
			@@ -748,6 +747,12 @@
			/// <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;
			@@ -895,11 +900,10 @@
			deviceListScrolView = new VerticalScrolViewLayout
			{
			X = Application.GetRealWidth(CommonFormResouce.X_Left),
			Y = functionTypeScrowView.Bottom + Application.GetRealHeight(50),
			Y = Application.GetRealHeight(35+275),
			Width = Application.GetRealWidth(1028),
			Height = functionSceneBodyView.Height - Application.GetRealHeight(279 + 50) - 1,
			Height = Application.GetRealHeight(938) - 1,
			BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor

			};
			functionSceneBodyView.AddChidren(deviceListScrolView);
			tempFunctionTypeBtn = new FunctionButton();
			@@ -987,18 +991,18 @@

			var deviceTypeRowLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(127 + 35),
			Height = Application.GetRealHeight(129 + 35),
			LineColor = ZigbeeColor.Current.GXCBackgroundColor,
			Tag = deviceUI
			};
			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(light.IsOnline == 1);
			deviceRow.SetZoneText(deviceUI.GetZone());
			deviceTypeRowLayout.AddChidren(deviceRow);


			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			{
			@@ -1007,6 +1011,7 @@
			zbGateway.ReportAction += UpdateDeviceControllStatu;
			AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);
			(send2 as Button).IsSelected = !(send2 as Button).IsSelected;
			deviceRow.IsSelected = (send2 as Button).IsSelected;
			if ((send2 as Button).IsSelected)
			{
			light.SwitchControl(1);
			@@ -1028,6 +1033,15 @@
			DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
			}
			});
			};

			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);
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			@@ -1080,10 +1094,11 @@
			};
			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(airSwitch.IsOnline == 1);
			deviceRow.SetZoneText(deviceUI.GetZone());
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			@@ -1115,6 +1130,15 @@
			DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
			}
			});
			};

			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);
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			@@ -1163,16 +1187,17 @@

			var deviceTypeRowLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(127 + 35),
			Height = Application.GetRealHeight(129 + 35),
			LineColor = ZigbeeColor.Current.GXCBackgroundColor,
			Tag = deviceUI
			};
			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(dimmableLight.IsOnline == 1);
			deviceRow.SetZoneText(deviceUI.GetZone());
			deviceTypeRowLayout.AddChidren(deviceRow);

			deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
			@@ -1204,6 +1229,16 @@
			DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
			}
			});
			};

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
			UserView.HomePage.Instance.AddChidren(dimmableLightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			UserView.HomePage.Instance.ScrollEnabled = false;
			dimmableLightControl.action = RefreshBodyView;
			dimmableLightControl.Show(deviceUI, room);
			};

			var editBtn = new CommonForm.RowLayoutEditButton()
			@@ -1434,13 +1469,15 @@
			typeRowLayout.AddChidren(functionTypeIMG);

			functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;



			if (deviceType == room.DeviceUIList[0].CommonDevice.Type)
			{
			ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
			}
			}


			}
			}

			@@ -1452,7 +1489,7 @@
			var roomFL = new HorizontalScrolViewLayout()
			{
			X = Application.GetRealWidth(CommonFormResouce.X_Left),
			Height = Application.GetRealHeight(167),
			Height = Application.GetRealHeight(170),
			Width = Application.GetRealWidth(CommonPage.AppRealWidth - CommonFormResouce.X_Left),
			BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
			};
			@@ -1462,7 +1499,7 @@
			functionSceneBodyView = new FrameLayout()
			{
			Y = roomFL.Bottom,
			Height = Application.GetRealHeight(1316),
			Height = Application.GetRealHeight(973+279),
			BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
			};
			functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
			@@ -1505,7 +1542,7 @@
			{
			RefreshFunction(room);
			}


			}
			roomBtn.MouseUpEventHandler += (sender, e) =>
			{
			@@ -1526,7 +1563,7 @@
			}
			};
			}


			}

			#endregion
			@@ -1556,7 +1593,7 @@
			{
			var sceneScrolView = new VerticalScrolViewLayout
			{
			Y = Application.GetRealHeight(58)
			//Y = Application.GetRealHeight(58)
			};
			functionSceneBodyView.AddChidren(sceneScrolView);
			foreach (var scene in sceneList)
			@@ -1611,7 +1648,7 @@
			Tag = scene
			};
			leftFL.AddChidren(collectionBtn);


			var sceneNameBtn = new Button()
			{
			Width = Application.GetRealWidth(176),
			@@ -1760,7 +1797,7 @@
			}
			};
			}


			};
			deleteBtn.MouseUpEventHandler += delEvent;
			//编辑场景
			@@ -1822,10 +1859,10 @@
			/// 自动化
			/// </summary>
			private async void ShowAutotion()
			{
			{

			functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;


			var bjFrameLayout = new FrameLayout
			{
			Width = Application.GetRealWidth(1080 - 58),
			@@ -1958,12 +1995,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();
			@@ -2102,11 +2134,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);