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/DoorLockLogic/AddCondition.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index ea49ce1..dae8177 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -27,7 +27,7 @@
 
             var titleName = new Button
             {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(176),
@@ -137,6 +137,7 @@
                     Width = Application.GetRealWidth(600),
                     Height = Application.GetRealHeight(130),
                     Tag = Send.LockList[i],
+                    TextSize = 14,
                 };
                 userRow.AddChidren(usernameBtn);
 
@@ -203,6 +204,7 @@
             {
                 Height = Application.GetRealHeight(140),
                 LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+
             };
             lockcolorfra1.AddChidren(lockRow);
             var Btncancel = new Button
@@ -213,6 +215,7 @@
                 Width = Application.GetRealWidth(200),
                 X = Application.GetRealWidth(80),
                 TextAlignment = TextAlignment.CenterLeft,
+                TextSize = 14,
             };
             lockRow.AddChidren(Btncancel);
             Btncancel.MouseUpEventHandler += (sender16, e16) =>
@@ -241,6 +244,7 @@
                 Width = Application.GetRealWidth(200),
                 TextAlignment = TextAlignment.CenterRight,
                 X = Btntitle.Right + Application.GetRealWidth(100),
+                TextSize = 14,
 
             };
             lockRow.AddChidren(Btncomplete);
@@ -277,6 +281,7 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                     Text = userIdmode.ModeName,
+                    TextSize = 14,
                 };
                 doorlockRow.AddChidren(doorlockBtn);
                 //(0鎸夐敭/3鍗�/15鎸囩汗)

--
Gitblit v1.8.0