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/LogicDevicePage.cs |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index ce17c11..e7062c3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -40,7 +40,7 @@
 
             var titleName = new Button
             {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(160),
@@ -90,6 +90,7 @@
                 Y = Application.GetRealHeight(92),
                 //TextID = MyInternationalizationString.customroom,
                 Text = Config.Instance.Home.GetCurrentFloorName,
+                TextSize = 14,
             };
             topRowLayout.AddChidren(foolrname);
             var dropdown = new Button
@@ -192,6 +193,7 @@
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     X = Application.GetRealWidth(80),
                     TextID = MyInternationalizationString.selecfoolr,
+                    TextSize = 14,
                 };
                 foolrbjicon.AddChidren(btnfoolrtext);
 
@@ -233,6 +235,7 @@
                         TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                         Tag = foolr.Key,
                         X = btnfoolricon.Right + Application.GetRealWidth(12),
+                        TextSize = 14,
                     };
                     foolrRowLayout.AddChidren(btnfoolrname);
                     if (foolrname.Text == foolr.Value)
@@ -611,6 +614,7 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 14,
                 };
                 deviceRow.AddChidren(devicename);
                 switch (common.CommonDevice.Type)
@@ -724,6 +728,8 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
+
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -752,6 +758,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(50),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -836,6 +843,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -866,6 +874,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -896,6 +905,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         takebackrowlayout.AddChidren(btntakeback);
 
@@ -1046,6 +1056,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1102,6 +1113,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -1133,6 +1145,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         takebackrowlayout.AddChidren(btntakeback);
 
@@ -1340,6 +1353,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1397,6 +1411,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 
@@ -1573,6 +1588,7 @@
                                 TextID = MyInternationalizationString.open,
                                 TextAlignment = TextAlignment.CenterLeft,
                                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                TextSize = 14,
                             };
                             openrowlayout.AddChidren(btnopen);
 
@@ -1603,6 +1619,7 @@
                                 Width = Application.GetRealWidth(600),
                                 TextAlignment = TextAlignment.CenterLeft,
                                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                TextSize = 14,
                             };
                             closerowlayout.AddChidren(btnclose);
 
@@ -1633,6 +1650,7 @@
                                 Width = Application.GetRealWidth(600),
                                 TextAlignment = TextAlignment.CenterLeft,
                                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                                TextSize = 14,
                             };
                             takebackrowlayout.AddChidren(btntakeback);
 
@@ -1792,6 +1810,7 @@
                             TextID = MyInternationalizationString.open,
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         openrowlayout.AddChidren(btnopen);
 
@@ -1879,6 +1898,7 @@
                             Width = Application.GetRealWidth(600),
                             TextAlignment = TextAlignment.CenterLeft,
                             TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                            TextSize = 14,
                         };
                         closerowlayout.AddChidren(btnclose);
 

--
Gitblit v1.8.0