From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index c24c8fd..48ba5d5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -28,7 +28,7 @@
             this.AddChidren(topRowLayout);
 
             var titleName = new Button {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(176),
@@ -108,6 +108,7 @@
                 Text = Language.StringByID(MyInternationalizationString.timecondition),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize=15,
             };
             timerow.AddChidren(btntime);
 
@@ -169,6 +170,7 @@
                 TextID = MyInternationalizationString.device,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             devicerow.AddChidren(btndevice);
 
@@ -232,6 +234,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = MyInternationalizationString.security,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             securityrow.AddChidren(btnsecurity);
 
@@ -292,6 +295,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextID = MyInternationalizationString.location,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             locationrow.AddChidren(btnlocation);
 
@@ -332,6 +336,7 @@
                 X = Application.GetRealWidth(60),
                 TextID = MyInternationalizationString.automation,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                TextSize = 15,
             };
             existencerowlayout.AddChidren(btnexistence);
 
@@ -410,6 +415,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -437,6 +443,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -471,6 +478,7 @@
                 TextID = MyInternationalizationString.logicathomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             athomedefenceRowLayout.AddChidren(btnathomedefence);
 
@@ -504,6 +512,7 @@
                 TextID = MyInternationalizationString.logicremovehomegarrison,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
             var leavehomedefenceSelected = new SelectedButton();
@@ -535,6 +544,7 @@
                 TextID = MyInternationalizationString.withdrawal,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             withdrawalRowLayout.AddChidren(btnwithdrawal);
             var withdrawalSelected = new SelectedButton();
@@ -750,6 +760,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             typeRow.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -777,6 +788,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             typeRow.AddChidren(Btncomplete);
@@ -808,6 +820,7 @@
                 TextID = MyInternationalizationString.athome,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
 
 
             };
@@ -840,6 +853,7 @@
                 TextID = MyInternationalizationString.leavehome,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             leavehomeRowLayout.AddChidren(btnleavehome);
             var leavehomeSelected = new SelectedButton();
@@ -1033,6 +1047,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1060,6 +1075,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -1093,6 +1109,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text="绔嬪嵆鎵ц",
+                TextSize = 14,
             };
             timerow.AddChidren(Btntimepoint);
 
@@ -1126,6 +1143,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                 //Text = "鏃堕棿鑼冨洿",
+                TextSize = 14,
             };
             time1row.AddChidren(Btntime);
 

--
Gitblit v1.8.0