From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 1ec1302..d888782 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -132,6 +132,7 @@
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceAddFunctionText;
+
/// <summary>
/// 杞欢璁剧疆鍖哄煙
/// </summary>
@@ -187,7 +188,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(94),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
@@ -200,13 +201,13 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = string.IsNullOrEmpty(MainPage.LoginUser.userName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.userName
+ Text = string.IsNullOrEmpty( UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
};
personalInfoView.AddChidren(btnUserName);
- if (!string.IsNullOrEmpty(MainPage.LoginUser.userName))
+ if (!string.IsNullOrEmpty( UserInfo.Current.userName))
{
- btnUserName.Text = MainPage.LoginUser.userName;;
+ btnUserName.Text = UserInfo.Current.userName; ;
}
btnEmail = new Button()
{
@@ -215,7 +216,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.LoginUser.accountString
+ Text = UserInfo.Current.AccountString
};
personalInfoView.AddChidren(btnEmail);
@@ -226,15 +227,15 @@
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
Radius = (uint)Application.GetMinRealAverage(42),
- ImagePath = MainPage.LoginUser.headImagePagePath
+ ImagePath = UserInfo.Current.headImagePagePath
};
bodyView.AddChidren(userHeadImageView);
- //if ( MainPage.LoginUser.headImagePageBytes==null)
+ //if ( UserInfo.Current.headImagePageBytes==null)
//{
- // userHeadImageView.ImagePath = MainPage.LoginUser.headImagePagePath;
+ // userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath;
//}else
//{
- // userHeadImageView.ImageBytes = MainPage.LoginUser.headImagePageBytes;
+ // userHeadImageView.ImageBytes = UserInfo.Current.headImagePageBytes;
//}
#endregion
@@ -245,6 +246,12 @@
Height = Application.GetRealHeight(400),
};
bodyView.AddChidren(contentView);
+ LoadContentView();
+ }
+
+ public void LoadContentView()
+ {
+ contentView.RemoveAll();
#region 浣忓畢淇℃伅鍖哄煙
if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
@@ -255,7 +262,7 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(213),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
@@ -269,7 +276,7 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(144),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
@@ -368,6 +375,7 @@
};
residenceManageView.AddChidren(btnResidenceManageText);
#endregion
+
#region ---鎴愬憳鍖哄煙
residenceMemberView = new FrameLayout()
{
@@ -615,7 +623,6 @@
#endregion
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-
#region 杞欢璁剧疆鍖哄煙
softSettingView = new FrameLayout()
{
@@ -623,7 +630,7 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(88),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
@@ -643,7 +650,7 @@
{
X = Application.GetRealWidth(48),
Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealWidth(44),
TextID = StringId.NightView,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -673,7 +680,7 @@
Button btnGeneralSettingsIcon = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(54),
+ Y = Application.GetRealWidth(54),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "PersonalCenter/GeneralSettingsIcon.png",
@@ -685,7 +692,7 @@
X = Application.GetRealWidth(48),
Y = btnSoftSettingViewLine.Bottom,
Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealWidth(44),
TextID = StringId.GeneralSettings,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -703,7 +710,6 @@
};
softSettingView.AddChidren(btnGeneralSettingsRight);
#endregion
-
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
#region 鑾峰彇鏀寔
supportView = new FrameLayout()
@@ -712,7 +718,7 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(88),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
@@ -732,7 +738,7 @@
{
X = Application.GetRealWidth(48),
Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealWidth(44),
TextID = StringId.GetSupport,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -754,7 +760,7 @@
var btnSupportViewLine = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnNightViewModeText.Bottom,
+ Y = btnSupportText.Bottom,
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor
};
@@ -763,7 +769,7 @@
Button btnAboutOnIcon = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(54),
+ Y = Application.GetRealWidth(54),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "PersonalCenter/InfoOnIcon.png",
@@ -773,9 +779,9 @@
btnAboutOnText = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnSoftSettingViewLine.Bottom,
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(44),
+ Y = btnSupportViewLine.Bottom,
+ Width = Application.GetRealWidth(370),
+ Height = Application.GetRealWidth(44),
TextID = StringId.AboutOn,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -801,4 +807,4 @@
LoadEventList();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0