From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 7a6332d..df6caf4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -192,12 +192,12 @@
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
-                Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
+                Text = UserInfo.Current.userName// string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
             };
             personalInfoView.AddChidren(btnUserName);
-            if (!string.IsNullOrEmpty( UserInfo.Current.userName))
+            if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
             {
-                btnUserName.Text =  UserInfo.Current.userName; ;
+                btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
             }
             btnEmail = new Button()
             {
@@ -244,7 +244,6 @@
         {
             contentView.RemoveAll();
 
-            #region F3闃舵
             #region 浣忓畢淇℃伅鍖哄煙
             //if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
             //{
@@ -261,7 +260,6 @@
             //    contentView.AddChidren(residenceInfoView);
             //}
             //else
-            #endregion
             {
                 residenceInfoView = new FrameLayout()
                 {
@@ -310,6 +308,12 @@
                 BackgroundImagePath = "PersonalCenter/UserTypebg.png",
             };
             residenceInfoView.AddChidren(userTypeView);
+            if (Language.CurrentLanguage != "Chinese" && !DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+            {
+                userTypeView.X = Application.GetRealWidth(200);
+                userTypeView.Width = Application.GetRealWidth(180);
+                userTypeView.BackgroundImagePath = "PersonalCenter/UserTypebg2.png";
+            }
 
             btnUserTypeIcon = new Button()
             {
@@ -321,11 +325,10 @@
                                     == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
             };
             userTypeView.AddChidren(btnUserTypeIcon);
-
             btnUserTypeName = new Button()
             {
                 X = Application.GetRealWidth(8) + btnUserTypeIcon.Right,
-                Width = Application.GetRealWidth(80),
+                Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(17 * 3),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.MainBackgroundColor,
@@ -336,7 +339,7 @@
             userTypeView.AddChidren(btnUserTypeName);
             #endregion
             #region 浣忓畢绠$悊
-          
+
             if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
             {
                 #region ---浣忓畢绠$悊鍖哄煙
@@ -495,8 +498,9 @@
                 #region ---娣诲姞鍔熻兘鍖哄煙
                 residenceAddFunctionView = new FrameLayout()
                 {
-                    X = residenceAuxiliaryFunctionView.Right,
-                    Y = residenceManageView.Bottom,
+                    X = residenceMemberView.Right,
+                    //X = Application.GetRealWidth(28 - 24),
+                    Y = Application.GetRealHeight(68),
                     Width = Application.GetRealWidth(64 + 48),
                     Height = Application.GetRealWidth(64),
                 };

--
Gitblit v1.8.0