From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index db9f46b..dd0f81d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -21,7 +21,6 @@
         /// </summary>
         ImageView userHeadImageView;
 
-
         #region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣
         /// <summary>
         /// 鑳屾櫙鍥鹃�夐」鍖哄煙
@@ -44,8 +43,6 @@
         /// </summary>
         Button btnCancel;
         #endregion
-
-
 
         #region 涓汉淇℃伅閫夐」鍖哄煙
         /// <summary>
@@ -168,19 +165,22 @@
         /// 鏇存柊澶村儚鐨勫洖璋冨嚱鏁�
         /// </summary>
         Action updataHeadImage;
+        /// <summary>
+        /// 鏇存柊鐢ㄦ埛鍚嶇О鐨勫洖璋冨嚱鏁�
+        /// </summary>
+        Action updataUserName;
 
-        public PersonalDataPage(Action upHeadImage)
+        public PersonalDataPage(Action upHeadImage,Action upUserName)
         {
             updataHeadImage = upHeadImage;
+            updataUserName = upUserName;
             bodyView = this;
         }
 
         public void LoadView()
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-
             new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
-            //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.PersonalCenter));
 
             headPortraitView = new FrameLayout()
             {
@@ -504,7 +504,7 @@
                 TextAlignment = TextAlignment.TopLeft,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.InterpretationSettingsTip
+                TextID = StringId.AppUnlockSettingsTip
             };
             interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);
 
@@ -531,10 +531,15 @@
             };
             bodyView.AddChidren(btnLogout);
 
+            if(MainPage.Increase)
+            {
+                btnLogout.Y = Application.GetRealHeight(613);
+                btnLogout.Height = Application.GetRealHeight(50);
+                bodyView.AddChidren(new Button() { Y = Application.GetRealHeight(663), Height = Application.GetRealHeight(20), BackgroundColor = CSS_Color.MainBackgroundColor });
+            }
+
             LoadEventList();
         }
-
-
 
         /// <summary>
         /// 鍔犺浇鍥炬爣閫夋嫨閫夐」
@@ -555,7 +560,9 @@
                 Height = Application.GetRealHeight(100),
                 BackgroundColor = CSS_Color.MainBackgroundColor,
                 Radius = (uint)Application.GetRealWidth(12),
+                AnimateSpeed = 0.3f,
                 Animate = Animate.DownToUp,
+                ScrollEnabled = false,
             };
             pictureOptionView.AddChidren(optionView);
 
@@ -607,13 +614,12 @@
                 Radius = (uint)Application.GetRealWidth(6),
                 TextID = StringId.Cancel,
                 TextColor = CSS_Color.WarningColor,
-                Animate = Animate.DownToUp
+                AnimateSpeed = 0.3f,
+                Animate = Animate.DownToUp,
             };
             pictureOptionView.AddChidren(btnCancel);
 
-
             LoadEvent_PictureOptionViewEventList();
         }
-
     }
 }

--
Gitblit v1.8.0