From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 154 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 115 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 4c1e868..2b9b5f8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -13,6 +13,11 @@
/// </summary>
FrameLayout bodyView;
/// <summary>
+ /// 褰撳墠
+ /// </summary>
+ VerticalScrolViewLayout bodyScrolView;
+
+ /// <summary>
/// 澶村儚鍖哄煙
/// </summary>
FrameLayout headPortraitView;
@@ -143,6 +148,7 @@
Button btnResetPasswordRight;
#endregion
#endregion
+
#endregion
#region 瑙ｉ攣璁剧疆鍖哄煙
@@ -170,7 +176,7 @@
/// </summary>
Action updataUserName;
- public PersonalDataPage(Action upHeadImage,Action upUserName)
+ public PersonalDataPage(Action upHeadImage, Action upUserName)
{
updataHeadImage = upHeadImage;
updataUserName = upUserName;
@@ -182,13 +188,27 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
- headPortraitView = new FrameLayout()
+ bodyScrolView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
+ VerticalScrollBarEnabled = false,
+ Height = Application.GetRealHeight(551),
+ };
+ bodyView.AddChidren(bodyScrolView);
+
+ if (MainPage.Increase)
+ {
+ bodyScrolView.Height = Application.GetRealHeight(541);
+ }
+
+ headPortraitView = new FrameLayout()
+ {
+ //Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(124),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(headPortraitView);
+
+ bodyScrolView.AddChidren(headPortraitView);
userHeadImageView = new ImageView()
{
@@ -196,22 +216,28 @@
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
Radius = (uint)Application.GetMinRealAverage(42),
- ImagePath = MainPage.LoginUser.headImagePagePath,
+ ImagePath = UserInfo.Current.headImagePagePath,
};
headPortraitView.AddChidren(userHeadImageView);
#region 涓汉淇℃伅閫夐」鍖哄煙
+ var topPaddingView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(8)
+ };
+ bodyScrolView.AddChidren(topPaddingView);
+
/// <summary>
/// 涓汉淇℃伅閫夐」鍖哄煙
/// </summary>
optionListView = new VerticalScrolViewLayout()
{
- Y = headPortraitView.Bottom + Application.GetRealHeight(8),
- Height = Application.GetRealHeight(51 * 6),
+ //Y = headPortraitView.Bottom + Application.GetRealHeight(8),
+ Height = Application.GetRealHeight(51 * 5),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
- bodyView.AddChidren(optionListView);
+ bodyScrolView.AddChidren(optionListView);
#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
@@ -244,7 +270,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 +367,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 +416,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>
@@ -408,6 +434,7 @@
optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
#region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
+ //2020-12-08 鏆傛椂闅愯棌绗笁鏂规巿鏉冨姛鑳�
/// <summary>
/// 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
/// </summary>
@@ -415,7 +442,7 @@
{
Height = Application.GetRealHeight(50),
};
- optionListView.AddChidren(thirdPartyAuthorizationView);
+ //optionListView.AddChidren(thirdPartyAuthorizationView);
/// <summary>
/// 绗笁鏂规巿鏉冩枃鏈彁绀轰俊鎭寜閽�
/// </summary>
@@ -438,7 +465,7 @@
UnSelectedImagePath = "Public/Right.png",
};
thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
- optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+ //optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
#region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
/// <summary>
@@ -455,7 +482,7 @@
btnResetPasswordText = new Button()
{
X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(220),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -476,16 +503,25 @@
#endregion
#region 瑙ｉ攣璁剧疆鍖哄煙
+ var topPaddingView2 = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(8)
+ };
+ bodyScrolView.AddChidren(topPaddingView2);
/// <summary>
/// 瑙ｉ攣璁剧疆鍖哄煙
/// </summary>
interpretationSettingsView = new FrameLayout()
{
- Y = optionListView.Bottom + Application.GetRealHeight(8),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Height = Application.GetRealHeight(65),
+ Height = Application.GetRealHeight(66),
};
- bodyView.AddChidren(interpretationSettingsView);
+ bodyScrolView.AddChidren(interpretationSettingsView);
+ if(Language.CurrentLanguage != "Chinese")
+ {
+ interpretationSettingsView.Height = Application.GetRealHeight(80);
+ }
+
btnInterpretationSettingsTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -496,15 +532,18 @@
TextID = StringId.InterpretationSettings,
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);
+
btnInterpretationSettingsTip = new Button()
{
X = Application.GetRealWidth(16),
- Y = btnInterpretationSettingsTitle.Bottom + Application.GetRealHeight(4),
+ Y = btnInterpretationSettingsTitle.Bottom,
Height = Application.GetRealHeight(32),
+ Width = Application.GetRealWidth(290),
TextAlignment = TextAlignment.TopLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.AppUnlockSettingsTip
+ TextID = StringId.AppUnlockSettingsTip,
+ IsMoreLines = true,
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);
@@ -517,6 +556,26 @@
UnSelectedImagePath = "Public/Right.png",
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
+ interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
+ #endregion
+
+ #region 鏈嶅姟鍣ㄤ俊鎭�
+ ListCellView myServerInfoCellView = new ListCellView()
+ {
+ };
+ bodyScrolView.AddChidren(myServerInfoCellView);
+ //璺宠浆鏈嶅姟鍣ㄤ俊鎭�
+ Action selectAction = () =>
+ {
+ var myServerInfoPage = new MyServerInfoPage();
+ MainPage.BasePageView.AddChidren(myServerInfoPage);
+ myServerInfoPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ myServerInfoCellView.GoAction = selectAction;
+ myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
+ myServerInfoCellView.LineView.RemoveFromParent();
+
#endregion
btnLogout = new Button()
@@ -531,7 +590,7 @@
};
bodyView.AddChidren(btnLogout);
- if(MainPage.Increase)
+ if (MainPage.Increase)
{
btnLogout.Y = Application.GetRealHeight(613);
btnLogout.Height = Application.GetRealHeight(50);
@@ -539,6 +598,7 @@
}
LoadEventList();
+
}
/// <summary>
@@ -546,36 +606,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()
{
@@ -610,14 +667,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,
- 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