From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index bd5af18..0e83571 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,12 @@
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 +215,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 +226,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
@@ -261,7 +261,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,
};
@@ -275,7 +275,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,
};
@@ -374,6 +374,7 @@
};
residenceManageView.AddChidren(btnResidenceManageText);
#endregion
+
#region ---鎴愬憳鍖哄煙
residenceMemberView = new FrameLayout()
{
@@ -621,7 +622,6 @@
#endregion
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-
#region 杞欢璁剧疆鍖哄煙
softSettingView = new FrameLayout()
{
@@ -629,7 +629,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,
};
@@ -709,7 +709,6 @@
};
softSettingView.AddChidren(btnGeneralSettingsRight);
#endregion
-
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
#region 鑾峰彇鏀寔
supportView = new FrameLayout()
@@ -718,7 +717,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,
};
@@ -760,7 +759,7 @@
var btnSupportViewLine = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnNightViewModeText.Bottom,
+ Y = btnSupportText.Bottom,
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor
};
@@ -779,8 +778,8 @@
btnAboutOnText = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnSoftSettingViewLine.Bottom,
- Width = Application.GetRealWidth(270),
+ Y = btnSupportViewLine.Bottom,
+ Width = Application.GetRealWidth(370),
Height = Application.GetRealWidth(44),
TextID = StringId.AboutOn,
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -807,4 +806,4 @@
LoadEventList();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0