From ac2aeba22ed55fd81bd87a373017933ecb49508c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:22:54 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs
index b11ecb4..5dbfbec 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/FrameLayout50.cs
@@ -20,10 +20,11 @@
         public Button btnText = new Button
         {
             TextSize = TextSize.Text16,
-            Width = Application.GetRealWidth(150),
-            Height = Application.GetRealHeight(22),
+            Width = Application.GetRealWidth(150+20),
+            Height = Application.GetRealHeight(32),//22
             TextColor = CSS.CSS_Color.textColor,
             X = Application.GetRealWidth(16),
+            IsMoreLines=true,
         };
 
         /// <summary>
@@ -31,11 +32,11 @@
         /// </summary>
         public Button btnEditText = new Button
         {
-            Width = Application.GetRealWidth(357 - 52 - 150 - 16),
+            Width = Application.GetRealWidth(357 - 52 - 150 - 30-16),
             Height = Application.GetRealHeight(20),
             TextSize = TextSize.Text14,
             TextColor = CSS.CSS_Color.textCancelColor,
-            X = Application.GetRealWidth(150 + 16),
+            X = Application.GetRealWidth(150+30+16),
             TextAlignment = TextAlignment.CenterRight,
         };
 

--
Gitblit v1.8.0