~wjc/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
			@@ -191,6 +192,7 @@
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			X = Application.GetRealWidth(80),
			TextID = MyInternationalizationString.selecfoolr,
			TextSize = 14,
			};
			foolrbjicon.AddChidren(btnfoolrtext);

			@@ -232,6 +234,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			Tag = foolr.Key,
			X = btnfoolricon.Right + Application.GetRealWidth(12),
			TextSize = 14,
			};
			foolrRowLayout.AddChidren(btnfoolrname);
			if (foolrname.Text == foolr.Value)
			@@ -610,6 +613,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
			TextSize = 14,
			};
			deviceRow.AddChidren(devicename);
			switch (common.CommonDevice.Type)
			@@ -721,6 +725,7 @@
			Width = Application.GetRealWidth(200),
			X = Application.GetRealWidth(80),
			TextAlignment = TextAlignment.CenterLeft,
			TextSize = 14,
			};
			timetype.AddChidren(Btncancel);
			Btncancel.MouseUpEventHandler += (sender16, e16) =>
			@@ -749,6 +754,7 @@
			Width = Application.GetRealWidth(200),
			TextAlignment = TextAlignment.CenterRight,
			X = Btntitle.Right + Application.GetRealWidth(50),
			TextSize = 14,

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

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

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

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

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

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

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

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

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

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

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

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

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