From 4cc04639fbadde3a7f3b9875353df0d90fc09043 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 18 一月 2020 14:33:40 +0800
Subject: [PATCH] 节前备份

---
 HDL_ON/UI/UI2/4-PersonalCenter/UI/PersonalCenterPage.cs |   64 +++++++++++++++++--------------
 1 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UI/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UI/PersonalCenterPage.cs
index 436605c..68505bc 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UI/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UI/PersonalCenterPage.cs
@@ -3,7 +3,7 @@
 using HDL_ON.UI.CSS;
 using HDL_ON.UI;
 
-namespace HDL_ON.UI2
+namespace HDL_ON.UI
 {
     public partial class PersonalCenterPage : FrameLayout
     {
@@ -177,9 +177,9 @@
             #region 涓汉淇℃伅
             topbg = new FrameLayout()
             {
-                Y = Application.GetRealHeight(-10),
-                Height = Application.GetRealHeight(150),
-                Radius = 12,
+                Y = Application.GetRealHeight(-20),
+                Height = Application.GetRealHeight(160),
+                Radius = 16,
                 BorderColor = 0x00FFFFFF,
                 BorderWidth = 0,
                 BackgroundColor = CSS_Color.MainColor,
@@ -206,10 +206,13 @@
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
-                Text = MainPage.LoginUser.UserName,
+                Text = string.IsNullOrEmpty(MainPage.LoginUser.UserName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.UserName
             };
             personalInfoView.AddChidren(btnUserName);
-
+            if (!string.IsNullOrEmpty(MainPage.LoginUser.UserName))
+            {
+                btnUserName.Text = MainPage.LoginUser.UserName;
+            }
             btnEmail = new Button()
             {
                 Y = btnUserName.Bottom,
@@ -267,24 +270,26 @@
 
             }
             #region 椤堕儴淇℃伅鍖哄煙
-            btnResidenceDownIcon = new Button() {
+            btnResidenceDownIcon = new Button()
+            {
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
                 X = Application.GetRealWidth(16),
                 Y = Application.GetRealHeight(25),
-                UnSelectedImagePath = "PersonalCenter/DownIcon.png",
+                UnSelectedImagePath = "0Common/DownIcon.png",
             };
             residenceInfoView.AddChidren(btnResidenceDownIcon);
 
-            btnCurResidenceName = new Button() {
-                X = btnResidenceDownIcon.Right+ Application.GetRealWidth(1),
+            btnCurResidenceName = new Button()
+            {
+                X = btnResidenceDownIcon.Right + Application.GetRealWidth(1),
                 Y = Application.GetRealHeight(10),
-                Width = Application.GetRealWidth(120),
+                Width = Application.GetRealWidth(240),
                 Height = Application.GetRealHeight(45),
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
-                Text = UserConfig.Instance.CurrentRegion.RegionName,
+                Text = UserConfig.Instance.CurrentRegion.Name,
             };
             residenceInfoView.AddChidren(btnCurResidenceName);
 
@@ -348,7 +353,7 @@
                 {
                     Y = residenceManageIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.ResidenceManage,
+                    TextID = StringId.ResidenceManage,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -378,7 +383,7 @@
                 {
                     Y = residenceManageIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.ResidenceMemberManage,
+                    TextID = StringId.ResidenceMemberManage,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -407,7 +412,7 @@
                 {
                     Y = residenceManageIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.Undefense,
+                    TextID = StringId.Undefense,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -436,7 +441,7 @@
                 {
                     Y = residenceManageIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.DataBackup,
+                    TextID = StringId.DataBackup,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -466,7 +471,7 @@
                 {
                     Y = residenceManageIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.AuxiliaryFunction,
+                    TextID = StringId.AuxiliaryFunction,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -496,7 +501,7 @@
                 {
                     Y = residenceManageIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.AddFunction,
+                    TextID = StringId.AddFunction,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -528,7 +533,7 @@
                 {
                     Y = residenceArmIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.Undefense,
+                    TextID = StringId.Undefense,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -557,7 +562,7 @@
                 {
                     Y = residenceDataBackupIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.DataBackup,
+                    TextID = StringId.DataBackup,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -587,7 +592,7 @@
                 {
                     Y = residenceAuxiliaryFunctionIcon.Bottom,
                     Height = Application.GetRealHeight(29),
-                    TextID = InternationalizationString.AuxiliaryFunction,
+                    TextID = StringId.AuxiliaryFunction,
                     TextAlignment = TextAlignment.Center,
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
@@ -595,16 +600,14 @@
                 residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionText);
                 #endregion
 
-                
-
-
             }
             #endregion
 
             #endregion
 
             #region 杞欢璁剧疆鍖哄煙
-            softSettingView = new FrameLayout() {
+            softSettingView = new FrameLayout()
+            {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(8) + residenceInfoView.Bottom,
                 Width = Application.GetRealWidth(343),
@@ -616,7 +619,8 @@
             };
             bodyView.AddChidren(softSettingView);
 
-            btnNightViewModeIcon = new Button() {
+            btnNightViewModeIcon = new Button()
+            {
                 X = Application.GetRealWidth(12),
                 Y = Application.GetRealHeight(10),
                 Width = Application.GetMinRealAverage(24),
@@ -630,7 +634,7 @@
                 X = Application.GetRealWidth(48),
                 Width = Application.GetRealWidth(180),
                 Height = Application.GetRealHeight(44),
-                TextID = InternationalizationString.NightView,
+                TextID = StringId.NightView,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextAlignment = TextAlignment.CenterLeft,
@@ -672,7 +676,7 @@
                 Y = btnSoftSettingViewLine.Bottom,
                 Width = Application.GetRealWidth(180),
                 Height = Application.GetRealHeight(44),
-                TextID = InternationalizationString.GeneralSettings,
+                TextID = StringId.GeneralSettings,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.TextFontSize
@@ -711,7 +715,7 @@
                 X = Application.GetRealWidth(48),
                 Width = Application.GetRealWidth(180),
                 Height = Application.GetRealHeight(44),
-                TextID = InternationalizationString.GetSupport,
+                TextID = StringId.GetSupport,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.TextFontSize
@@ -720,6 +724,8 @@
 
             #endregion
 
+
+            LoadEventList();
         }
     }
 }

--
Gitblit v1.8.0