From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 57dd341..ffb66f9 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;
@@ -171,7 +176,7 @@
/// </summary>
Action updataUserName;
- public PersonalDataPage(Action upHeadImage,Action upUserName)
+ public PersonalDataPage(Action upHeadImage, Action upUserName)
{
updataHeadImage = upHeadImage;
updataUserName = upUserName;
@@ -183,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()
{
@@ -197,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),
+ //Y = headPortraitView.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(51 * 6),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
- bodyView.AddChidren(optionListView);
+ bodyScrolView.AddChidren(optionListView);
#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
@@ -245,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>
@@ -342,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>
@@ -391,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>
@@ -477,16 +502,21 @@
#endregion
#region 瑙ｉ攣璁剧疆鍖哄煙
+ var topPaddingView2 = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(8)
+ };
+ bodyScrolView.AddChidren(topPaddingView2);
/// <summary>
/// 瑙ｉ攣璁剧疆鍖哄煙
/// </summary>
interpretationSettingsView = new FrameLayout()
{
- Y = optionListView.Bottom + Application.GetRealHeight(8),
+ //Y = optionListView.Bottom + Application.GetRealHeight(8),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Height = Application.GetRealHeight(65),
+ Height = Application.GetRealHeight(66),
};
- bodyView.AddChidren(interpretationSettingsView);
+ bodyScrolView.AddChidren(interpretationSettingsView);
btnInterpretationSettingsTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -497,6 +527,7 @@
TextID = StringId.InterpretationSettings,
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);
+
btnInterpretationSettingsTip = new Button()
{
X = Application.GetRealWidth(16),
@@ -518,6 +549,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()
@@ -532,7 +583,7 @@
};
bodyView.AddChidren(btnLogout);
- if(MainPage.Increase)
+ if (MainPage.Increase)
{
btnLogout.Y = Application.GetRealHeight(613);
btnLogout.Height = Application.GetRealHeight(50);
@@ -540,6 +591,7 @@
}
LoadEventList();
+
}
/// <summary>
@@ -617,5 +669,24 @@
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