From 15978205aa7e4aeca8af3d3d34a80a85f0265f63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 10:42:52 +0800
Subject: [PATCH] 2020-12-14 1.密码锁定错误码处理
---
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 aace3fc..de9dd79 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>
@@ -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
@@ -253,7 +253,7 @@
contentView.RemoveAll();
#region 浣忓畢淇℃伅鍖哄煙
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
residenceInfoView = new FrameLayout()
{
@@ -302,7 +302,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = DB_ResidenceData.residenceData.residecenInfo.Name,
+ Text = DB_ResidenceData.Instance.CurrentRegion.Name,
};
residenceInfoView.AddChidren(btnCurResidenceName);
@@ -322,7 +322,7 @@
Y = Application.GetRealHeight(15),
Width = Application.GetMinRealAverage(20),
Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+ UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
== false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
};
userTypeView.AddChidren(btnUserTypeIcon);
@@ -335,13 +335,13 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+ TextID = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
== false ? StringId.Administrators : StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
residenceManageView = new FrameLayout()
@@ -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()
{
@@ -709,7 +709,6 @@
};
softSettingView.AddChidren(btnGeneralSettingsRight);
#endregion
-
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
#region 鑾峰彇鏀寔
supportView = new FrameLayout()
@@ -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