~xm/HomeApp.git

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

			var titleName = new Button
			{
			TextSize = 16,
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(160),
			@@ -89,6 +89,7 @@
			Y = Application.GetRealHeight(92),
			//TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			TextSize = 14,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -190,6 +191,7 @@
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			@@ -231,6 +233,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);
			if (foolrname.Text == foolr.Value)
			@@ -606,6 +609,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -719,6 +723,7 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,
			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -747,6 +752,7 @@
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

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

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

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

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

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

			@@ -1128,6 +1139,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

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

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

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

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

			@@ -1629,6 +1645,7 @@
			Width = Application.GetRealWidth(600),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
			TextSize = 14,
			};
			takebackrowlayout.AddChidren(btntakeback);

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

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