From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 14 四月 2020 14:15:35 +0800
Subject: [PATCH] 20200414

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

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 7370fc1..8434c49 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -1,7 +1,6 @@
-锘縰sing System;
-using Shared;
+锘縰sing Shared;
 using HDL_ON.UI.CSS;
-using HDL_ON.UI;
+using HDL_ON.Entity;
 
 namespace HDL_ON.UI
 {
@@ -32,6 +31,7 @@
         /// <summary>
         /// 鐢ㄦ埛澶村儚
         /// </summary>
+        ImageView userHeadImageView;
         Button btnUserHeadPortrait;
         /// <summary>
         /// 浣忓畢淇℃伅鍖哄煙
@@ -54,7 +54,7 @@
         /// </summary>
         Button btnUserTypeIcon;
         /// <summary>
-        /// 鐢ㄦ埛绫诲瀷鍥炬爣
+        /// 鐢ㄦ埛绫诲瀷鍚嶇О
         /// </summary>
         Button btnUserTypeName;
         /// <summary>
@@ -206,12 +206,13 @@
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
-                Text = string.IsNullOrEmpty(MainPage.LoginUser.UserName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.UserName
+                Text = string.IsNullOrEmpty(MainPage.LoginUser.userName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.userName
+
             };
             personalInfoView.AddChidren(btnUserName);
-            if (!string.IsNullOrEmpty(MainPage.LoginUser.UserName))
+            if (!string.IsNullOrEmpty(MainPage.LoginUser.userName))
             {
-                btnUserName.Text = MainPage.LoginUser.UserName;
+                btnUserName.Text = MainPage.LoginUser.userName;;
             }
             btnEmail = new Button()
             {
@@ -220,25 +221,32 @@
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.TextualColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = MainPage.LoginUser.AccountString
+                Text = MainPage.LoginUser.accountString
             };
             personalInfoView.AddChidren(btnEmail);
 
-            btnUserHeadPortrait = new Button()
+            userHeadImageView = new ImageView()
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(51),
                 Width = Application.GetMinRealAverage(84),
                 Height = Application.GetMinRealAverage(84),
                 Radius = (uint)Application.GetMinRealAverage(42),
-                UnSelectedImagePath = "LoginIcon/2.png"
+                //UnSelectedImagePath = MainPage.LoginUser.headImagePagePath
             };
-            bodyView.AddChidren(btnUserHeadPortrait);
+            bodyView.AddChidren(userHeadImageView);
+            if ( MainPage.LoginUser.headImagePageBytes==null)
+            {
+                userHeadImageView.ImagePath = MainPage.LoginUser.headImagePagePath;
+            }else
+            {
+                userHeadImageView.ImageBytes = MainPage.LoginUser.headImagePageBytes;
+            }
 
             #endregion
 
             #region 浣忓畢淇℃伅鍖哄煙
-            if (MainPage.LoginUser.AccountType == 0)
+            if (MainPage.LoginUser.accountType == 0)
             {
                 residenceInfoView = new FrameLayout()
                 {
@@ -289,10 +297,9 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
-                Text = UserConfig.Instance.CurrentRegion.Name,
+                Text = DB_ResidenceData.residenceData.residecenInfo.Name,
             };
             residenceInfoView.AddChidren(btnCurResidenceName);
-
 
             userTypeView = new FrameLayout()
             {
@@ -310,7 +317,7 @@
                 Y = Application.GetRealHeight(15),
                 Width = Application.GetMinRealAverage(20),
                 Height = Application.GetMinRealAverage(20),
-                UnSelectedImagePath = MainPage.LoginUser.AccountType == 0 ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
+                UnSelectedImagePath = MainPage.LoginUser.accountType == 0 ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
             };
             userTypeView.AddChidren(btnUserTypeIcon);
 
@@ -322,12 +329,12 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = MainPage.LoginUser.AccountType == 0 ? "绠$悊鍛�" : "鎴愬憳"
+                Text = MainPage.LoginUser.accountType == 0 ? "绠$悊鍛�" : "鎴愬憳"
             };
             userTypeView.AddChidren(btnUserTypeName);
             #endregion
             #region 浣忓畢绠$悊
-            if (MainPage.LoginUser.AccountType == 0)
+            if (MainPage.LoginUser.accountType == 0)
             {
                 #region ---浣忓畢绠$悊鍖哄煙
                 residenceManageView = new FrameLayout()

--
Gitblit v1.8.0