From 002a3f2e9d2f9579c01f88af12bd8a320003569f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 31 三月 2020 08:57:19 +0800
Subject: [PATCH] 20200331

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 5c35050..f7ff723 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -33,11 +33,11 @@
         /// <summary>
         /// 鐢ㄦ埛鍚嶇О鏍囬
         /// </summary>
-        Button btnUserName;
+        Button btnUserNameTitle;
         /// <summary>
         /// 鐢ㄦ埛鍚嶇О
         /// </summary>
-        EditText etUserName;
+        Button btnUserName;
         /// <summary>
         /// 淇敼鐢ㄦ埛鍚嶇О鎸夐挳
         /// </summary>
@@ -147,7 +147,8 @@
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
-            new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.PersonalCenter));
+            new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
+            //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.PersonalCenter));
 
             headPortraitView = new FrameLayout()
             {
@@ -174,7 +175,7 @@
             optionListView = new VerticalScrolViewLayout()
             {
                 Y = headPortraitView.Bottom + Application.GetRealHeight(8),
-                Height = Application.GetRealHeight(45 * 6),
+                Height = Application.GetRealHeight(51 * 6),
                 BackgroundColor = CSS_Color.MainBackgroundColor,
                 ScrollEnabled = false,
             };
@@ -185,13 +186,13 @@
             /// </summary>
             userNameView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealHeight(50),
             };
             optionListView.AddChidren(userNameView);
             /// <summary>
             /// 鐢ㄦ埛鍚嶇О鏍囬
             /// </summary>
-            btnUserName = new Button()
+            btnUserNameTitle = new Button()
             {
                 X = Application.GetRealWidth(16),
                 Width = Application.GetRealWidth(120),
@@ -200,11 +201,11 @@
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextID = StringId.Name,
             };
-            userNameView.AddChidren(btnUserName);
+            userNameView.AddChidren(btnUserNameTitle);
             /// <summary>
             /// 鐢ㄦ埛鍚嶇О
             /// </summary>
-            etUserName = new EditText()
+            btnUserName = new Button()
             {
                 X = Application.GetRealWidth(100),
                 Width = Application.GetRealWidth(230),
@@ -213,7 +214,7 @@
                 TextSize = CSS_FontSize.TextFontSize,
                 Text = string.IsNullOrEmpty(MainPage.LoginUser.UserName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.UserName
             };
-            userNameView.AddChidren(etUserName);
+            userNameView.AddChidren(btnUserName);
             /// <summary>
             /// 淇敼鐢ㄦ埛鍚嶇О鎸夐挳
             /// </summary>
@@ -223,7 +224,7 @@
                 Gravity = Gravity.CenterVertical,
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
-                UnSelectedImagePath = "PersonalCenter/PersonalData/EditIcon.png",
+                UnSelectedImagePath = "Public/EditIcon.png",
             };
             userNameView.AddChidren(btnEditUserNameIcon);
             optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
@@ -234,7 +235,7 @@
             /// </summary>
             _QRcodeView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealHeight(50),
             };
             optionListView.AddChidren(_QRcodeView);
             /// <summary>
@@ -272,7 +273,7 @@
                 Gravity = Gravity.CenterVertical,
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "PersonalCenter/PersonalData/Right.png",
+                UnSelectedImagePath = "Public/Right.png",
             };
             _QRcodeView.AddChidren(btnQRcodeRight);
             #endregion
@@ -282,7 +283,7 @@
             /// </summary>
             userEmailInfoView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealHeight(50),
             };
             optionListView.AddChidren(userEmailInfoView);
             /// <summary>
@@ -320,7 +321,7 @@
                 Gravity = Gravity.CenterVertical,
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "PersonalCenter/PersonalData/Right.png",
+                UnSelectedImagePath = "Public/Right.png",
             };
             userEmailInfoView.AddChidren(btnUserEmailRight);
             optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
@@ -331,7 +332,7 @@
             /// </summary>
             userPhoneInfoView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealHeight(50),
             };
             optionListView.AddChidren(userPhoneInfoView);
             /// <summary>
@@ -369,7 +370,7 @@
                 Gravity = Gravity.CenterVertical,
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "PersonalCenter/PersonalData/Right.png",
+                UnSelectedImagePath = "Public/Right.png",
             };
             userPhoneInfoView.AddChidren(btnUserPhoneRight);
             optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
@@ -380,7 +381,7 @@
             /// </summary>
             thirdPartyAuthorizationView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealHeight(50),
             };
             optionListView.AddChidren(thirdPartyAuthorizationView);
             /// <summary>
@@ -402,7 +403,7 @@
                 Gravity = Gravity.CenterVertical,
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "PersonalCenter/PersonalData/Right.png",
+                UnSelectedImagePath = "Public/Right.png",
             };
             thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
             optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
@@ -413,7 +414,7 @@
             /// </summary>
             resetPasswordView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealHeight(50),
             };
             optionListView.AddChidren(resetPasswordView);
             /// <summary>
@@ -435,10 +436,10 @@
                 Gravity = Gravity.CenterVertical,
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "PersonalCenter/PersonalData/Right.png",
+                UnSelectedImagePath = "Public/Right.png",
             };
             resetPasswordView.AddChidren(btnResetPasswordRight);
-            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+            //optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
             #endregion
             #endregion
 
@@ -483,7 +484,7 @@
                 Gravity = Gravity.CenterVertical,
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "PersonalCenter/PersonalData/Right.png",
+                UnSelectedImagePath = "Public/Right.png",
             };
             interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
             #endregion
@@ -491,7 +492,7 @@
             btnLogout = new Button()
             {
                 Y = Application.GetRealHeight(623),
-                Height = Application.GetRealHeight(44),
+                Height = Application.GetRealHeight(50),
                 TextAlignment = TextAlignment.Center,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextColor = CSS_Color.AuxiliaryColor2,

--
Gitblit v1.8.0