From d4160d80c79245c1d7d0cd450ba48cb7850e411d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 十一月 2020 10:45:54 +0800
Subject: [PATCH] 20201123
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index dd0f81d..f915cbe 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -143,6 +143,7 @@
Button btnResetPasswordRight;
#endregion
#endregion
+
#endregion
#region 瑙ｉ攣璁剧疆鍖哄煙
@@ -170,7 +171,7 @@
/// </summary>
Action updataUserName;
- public PersonalDataPage(Action upHeadImage,Action upUserName)
+ public PersonalDataPage(Action upHeadImage, Action upUserName)
{
updataHeadImage = upHeadImage;
updataUserName = upUserName;
@@ -196,7 +197,7 @@
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
Radius = (uint)Application.GetMinRealAverage(42),
- ImagePath = MainPage.LoginUser.headImagePagePath,
+ ImagePath = UserInfo.Current.headImagePagePath,
};
headPortraitView.AddChidren(userHeadImageView);
@@ -244,7 +245,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = string.IsNullOrEmpty(MainPage.LoginUser.userName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.userName
+ Text = string.IsNullOrEmpty( UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
};
userNameView.AddChidren(btnUserName);
/// <summary>
@@ -341,7 +342,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = string.IsNullOrEmpty(MainPage.LoginUser.userEmailInfo) ? Language.StringByID(StringId.Unbound) : MainPage.LoginUser.userEmailInfo
+ Text = GetBindAccountText( UserInfo.Current.userEmailInfo)
};
userEmailInfoView.AddChidren(btnUserEmailInfo);
/// <summary>
@@ -390,7 +391,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = string.IsNullOrEmpty(MainPage.LoginUser.userMobileInfo) ? Language.StringByID(StringId.Unbound) : MainPage.LoginUser.userMobileInfo
+ Text = GetBindAccountText( UserInfo.Current.userMobileInfo)
};
userPhoneInfoView.AddChidren(btnUserPhoneInfo);
/// <summary>
@@ -531,7 +532,7 @@
};
bodyView.AddChidren(btnLogout);
- if(MainPage.Increase)
+ if (MainPage.Increase)
{
btnLogout.Y = Application.GetRealHeight(613);
btnLogout.Height = Application.GetRealHeight(50);
@@ -539,6 +540,7 @@
}
LoadEventList();
+
}
/// <summary>
@@ -546,37 +548,33 @@
/// </summary>
void LoadPictureOptionView()
{
- pictureOptionView = new FrameLayout()
+ var pictureBaseView = new FrameLayout()
{
BackgroundColor = CSS_Color.DialogTransparentColor1,
+
};
- bodyView.AddChidren(pictureOptionView);
+ bodyView.AddChidren(pictureBaseView);
+
+ pictureOptionView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(495),
+ AnimateSpeed = 0.3f,
+ Animate = Animate.DownToUp,
+ Height = Application.GetRealHeight(200),
+ };
+ pictureBaseView.AddChidren(pictureOptionView);
+
optionView = new VerticalScrolViewLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(495),
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(100),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealWidth(12),
- AnimateSpeed = 0.3f,
- Animate = Animate.DownToUp,
ScrollEnabled = false,
};
pictureOptionView.AddChidren(optionView);
-
- //btnDefaultGallery = new Button()
- //{
- // Height = Application.GetRealHeight(50),
- // TextAlignment = TextAlignment.Center,
- // TextColor = CSS_Color.TextualColor,
- // SelectedTextColor = CSS_Color.MainColor,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextID = StringId.DefaultGallery,
- //};
- //optionView.AddChidren(btnDefaultGallery);
- //optionView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
btnTakePicture = new Button()
{
@@ -611,15 +609,33 @@
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(6),
+ Radius = (uint)Application.GetRealWidth(12),
TextID = StringId.Cancel,
TextColor = CSS_Color.WarningColor,
- AnimateSpeed = 0.3f,
- Animate = Animate.DownToUp,
+ TextSize = CSS_FontSize.SubheadingFontSize,
};
pictureOptionView.AddChidren(btnCancel);
- LoadEvent_PictureOptionViewEventList();
+ LoadEvent_PictureOptionViewEventList(pictureBaseView);
+ }
+
+ /// <summary>
+ /// 鑾峰彇缁戝畾璐﹀彿鏄剧ず鏂囨湰锛岀┖鐨勬椂鍊欐樉绀轰负鏈粦瀹�
+ /// </summary>
+ /// <param name="account"></param>
+ string GetBindAccountText(string account)
+ {
+ return string.IsNullOrEmpty(account) ? Language.StringByID(StringId.Unbound) : account;
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁涓烘湭缁戝畾
+ /// </summary>
+ /// <param name="account"></param>
+ /// <returns></returns>
+ bool CheckIfUnbound(string account)
+ {
+ return string.IsNullOrEmpty(account) || account == Language.StringByID(StringId.Unbound);
}
}
}
--
Gitblit v1.8.0