~wjc/HomeApp.git

			@@ -23,6 +23,7 @@
			FrameLayout clickframeLayout = new FrameLayout();
			Button clickbutton = new Button();
			Button clicktextcolcrbutton = new Button();
			HorizontalScrolViewLayout devicetypehorizontalScrol1;
			public void Show()
			{

			@@ -39,7 +40,7 @@

			var titleName = new Button
			{
			TextSize = 16,
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(160),
			@@ -89,6 +90,7 @@
			Y = Application.GetRealHeight(92),
			//TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			TextSize = 14,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -108,7 +110,7 @@
			///没有房间直接返回去；
			if (Common.Room.Lists.Count == 0)
			{
			return;
			return;
			}
			///房间滑动控件
			var roomhorizontalScrol = new HorizontalScrolViewLayout()
			@@ -120,7 +122,7 @@
			};
			this.AddChidren(roomhorizontalScrol);

			var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
			devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
			{
			Width = Application.GetRealWidth(1080 - 58 - 200),
			Height = Application.GetRealHeight(280),
			@@ -188,6 +190,7 @@
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			@@ -229,6 +232,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);
			if (foolrname.Text == foolr.Value)
			@@ -345,6 +349,18 @@
			}
			list.Add(device);
			}
			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);

			@@ -375,6 +391,19 @@
			continue;
			}
			list.Add(device);
			}

			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);
			@@ -608,6 +637,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -703,8 +733,6 @@
			flMain.MouseUpEventHandler += (sender, e) =>
			{
			flMain.RemoveFromParent();


			};

			var devicefra1 = new FrameLayout
			@@ -742,6 +770,7 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,
			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -770,6 +799,7 @@
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

			};
			timetype.AddChidren(Btncomplete);
			@@ -830,6 +860,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -860,6 +891,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -955,6 +987,7 @@
			Height = Application.GetRealHeight(180),
			//SelectedBackgroundColor = 0xfffe5e00,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -985,6 +1018,7 @@
			Width = Application.GetRealWidth(300),
			Height = Application.GetRealHeight(180),
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -1081,6 +1115,7 @@
			TextID = MyInternationalizationString.open,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			openrowlayout.AddChidren(btnopen);

			@@ -1111,6 +1146,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			closerowlayout.AddChidren(btnclose);

			@@ -1154,7 +1190,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;
			@@ -1236,7 +1272,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;
			@@ -1255,7 +1291,6 @@
			#endregion
			}
			break;

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

			case 277:
			{
			devicefra.Y = Application.GetRealHeight(1920 - 140 - 160 - 20 - 50);
			@@ -1382,6 +1416,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			Text = Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString(),
			TextSize = 14,
			//SelectedBackgroundColor = 0xfffe5e00,
			};
			buttonRow.AddChidren(button);
			@@ -1411,11 +1446,10 @@
			case DeviceType.DoorLock:
			{


			flMain.RemoveFromParent();
			var memberList = new MemberList();
			UserView.HomePage.Instance.AddChidren(memberList);
			UserView.HomePage.Instance.PageIndex += 1;
			MemberList.action += () => { flMain.RemoveFromParent(); };
			MemberList.edit = false;
			memberList.Show(common);
			}
			@@ -1434,6 +1468,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(80),
			Y = timetype.Bottom + Application.GetRealHeight(70),
			TextSize = 14,
			};
			devicefra.AddChidren(Btntemperaturevalue);