From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）

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

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index b761c62..92f05bc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -36,7 +36,7 @@
 
             var titleName = new Button
             {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(176),
@@ -131,6 +131,7 @@
                 TextID = MyInternationalizationString.automationname,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 Y = Application.GetRealHeight(35),
+                TextSize = 15,
             };
             logicnamefl.AddChidren(text);
 
@@ -142,7 +143,7 @@
                 X = text.Right,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
-                TextSize = 13,
+                TextSize = 14,
                 Text = Common.Logic.CurrentLogic.LogicName,
                 //TextID=MyInternationalizationString.automation1,
             };
@@ -185,7 +186,7 @@
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 Width = Application.GetRealWidth(300),
                 Height = Application.GetRealHeight(60),
-                TextSize = 16,
+                TextSize = 15,
                 Gravity = Gravity.CenterVertical,
             });
 
@@ -301,6 +302,7 @@
                         TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                         TextID = MyInternationalizationString.addconditions,
                         X = Application.GetRealWidth(390),
+                        TextSize = 14,
                     };
                     addfl.AddChidren(addtextbtn);
 
@@ -374,6 +376,7 @@
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Text = deviceinof.DeviceEpointName,
                                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextSize = 14,
                                 };
                                 conditionsRowLayout.AddChidren(btndevice);
 
@@ -416,6 +419,7 @@
                                     TextAlignment = TextAlignment.CenterRight,
                                     X = Application.GetRealWidth(400),
                                     TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                    TextSize = 14,
                                 };
                                 conditionsRowLayout.AddChidren(devicestatus);
 
@@ -532,7 +536,7 @@
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 Width = Application.GetRealWidth(300),
                 Height = Application.GetRealHeight(60),
-                TextSize = 16,
+                TextSize = 15,
                 Gravity = Gravity.CenterVertical,
             };
             targetRowLayout.AddChidren(btntargettitle);
@@ -602,6 +606,7 @@
                         TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                         TextID = MyInternationalizationString.addfunction,
                         X = Application.GetRealWidth(390),
+                        TextSize = 14,
                     };
                     addfl.AddChidren(addtextbtn);
                     EventHandler<MouseEventArgs> addfunctionclick = (sender, e) =>
@@ -672,6 +677,7 @@
                                     TextAlignment = TextAlignment.CenterLeft,
                                     Text = deviceinof.DeviceEpointName,
                                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+                                    TextSize = 14,
                                 };
                                 actionsrowLayout.AddChidren(btndevicename);
 
@@ -697,6 +703,7 @@
                                     TextAlignment = TextAlignment.CenterRight,
                                     X = Application.GetRealWidth(450),
                                     TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                                    TextSize = 14,
                                 };
                                 actionsrowLayout.AddChidren(devicestatus);
 
@@ -1033,6 +1040,7 @@
                 Width = Application.GetRealWidth(300),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterVertical,
+                TextSize = 14,
             };
             weekRowLayout.AddChidren(settxet);
             var btnweektext = new Button
@@ -1045,6 +1053,7 @@
                 TextID = MyInternationalizationString.everyday,
                 Y = Application.GetRealHeight(35),
                 X = settxet.Right,
+                TextSize = 14,
             };
             weekRowLayout.AddChidren(btnweektext);
 
@@ -1105,6 +1114,7 @@
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterVertical,
                 TextID = MyInternationalizationString.pushswitch,
+                TextSize = 14,
             };
             pushswitchRowlayout.AddChidren(btnswitchtxet);
 
@@ -1157,6 +1167,7 @@
                 Width = Application.GetRealWidth(300),
                 Height = Application.GetRealHeight(60),
                 Gravity = Gravity.CenterVertical,
+                TextSize = 14,
             };
             custompushRowLayout.AddChidren(btncustompush);
 
@@ -1559,6 +1570,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             timetype.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -1586,6 +1598,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             timetype.AddChidren(Btncomplete);
@@ -1621,6 +1634,7 @@
                 TextID = MyInternationalizationString.Allconditions,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
 
             };
             androw.AddChidren(andbtn);
@@ -1656,6 +1670,7 @@
                 TextID = MyInternationalizationString.anycondition,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+                TextSize = 14,
             };
             orrow.AddChidren(orbtn);
 

--
Gitblit v1.8.0