~wjc/HomeApp.git

			@@ -19,7 +19,6 @@
			Button roomTextButton = new Button();
			Button devicetypeButton = new Button();
			VerticalScrolViewLayout middle;
			HorizontalScrolViewLayout devicetypehorizontalScrol1;
			FrameLayout clickframeLayout = new FrameLayout();
			Button clickbutton = new Button();
			Button clicktextcolcrbutton = new Button();
			@@ -48,6 +47,7 @@
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.devicestate,
			IsBold = true,
			};
			topRowLayout.AddChidren(titleName);

			@@ -121,15 +121,7 @@
			};
			this.AddChidren(roomhorizontalScrol);

			devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
			{
			Width = Application.GetRealWidth(1080 - 58 - 200),
			Height = Application.GetRealHeight(280),
			Y = roomhorizontalScrol.Bottom,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58 + 200),
			};
			this.AddChidren(devicetypehorizontalScrol1);

			///设备类型滑动控件
			var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
			{
			@@ -138,18 +130,20 @@
			Y = roomhorizontalScrol.Bottom,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58),
			Radius = (uint)Application.GetRealHeight(50),
			//Radius = (uint)Application.GetRealHeight(50),

			};
			this.AddChidren(devicetypehorizontalScrol);
			devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);

			middle = new VerticalScrolViewLayout();
			middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			middle.X = Application.GetRealWidth(58);
			middle.Radius = (uint)Application.GetRealHeight(50);
			// middle.Radius = (uint)Application.GetRealHeight(50);
			this.AddChidren(middle);
			middle.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);

			///目前支持的设备
			var deviceTypeList = new List<DeviceType> {
			@@ -349,13 +343,13 @@
			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			devicetypehorizontalScrol1.Height = 0;

			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);

			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}
			AllDeviceTypeView(list, devicetypehorizontalScrol);
			@@ -391,13 +385,13 @@
			if (list.Count == 0)
			{
			devicetypehorizontalScrol.Height = 0;
			devicetypehorizontalScrol1.Height = 0;

			middle.Height = 0;
			}
			else
			{
			devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
			devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);

			middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
			}
			AllDeviceTypeView(list, devicetypehorizontalScrol);
			@@ -722,14 +716,6 @@

			};

			var devicefra1 = new FrameLayout
			{
			Width = Application.GetRealWidth(1080),
			Height = Application.GetRealHeight(100),
			Y = Application.GetRealHeight(1920 - 100),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			};
			flMain.AddChidren(devicefra1);

			var devicefra = new FrameLayout
			{
			@@ -741,6 +727,7 @@
			Radius = (uint)Application.GetRealHeight(60),
			};
			flMain.AddChidren(devicefra);
			devicefra.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerTopRight);

			#region -------取消完成
			var timetype = new RowLayout
			@@ -925,7 +912,7 @@
			dictionary(deviceConditionsInfo, "AttriButeData1", "0");
			if (iASZonedevice.IasDeviceType == 13)
			{
			SelectedDeviceStatuscondition = "no";
			SelectedDeviceStatuscondition = "";
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openBtnSelected.Visible = false;
			@@ -1007,7 +994,7 @@
			timeoutrowlayout.AddChidren(timeoutBtnSelected);
			EventHandler<MouseEventArgs> timeoutclick = (sender, e) =>
			{
			SelectedDeviceStatuscondition = "no";
			SelectedDeviceStatuscondition = "";
			btnopen.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			btnclose.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			openBtnSelected.Visible = false;
			@@ -1026,7 +1013,6 @@
			#endregion
			}
			break;

			case 40:
			{
			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			@@ -1066,7 +1052,6 @@
			openrowlayout.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
			}
			break;

			case 277:
			{
			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			@@ -1135,7 +1120,7 @@
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
			Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
			Language.StringByID(MyInternationalizationString.complete));
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}