From 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:07:47 +0800
Subject: [PATCH] Revert "20201127 合并嘉乐代码"
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 73 +++++-------------------------------
1 files changed, 11 insertions(+), 62 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index ffb66f9..f915cbe 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -13,11 +13,6 @@
/// </summary>
FrameLayout bodyView;
/// <summary>
- /// 褰撳墠
- /// </summary>
- VerticalScrolViewLayout bodyScrolView;
-
- /// <summary>
/// 澶村儚鍖哄煙
/// </summary>
FrameLayout headPortraitView;
@@ -188,27 +183,13 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
- 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),
+ Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(124),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
-
- bodyScrolView.AddChidren(headPortraitView);
+ bodyView.AddChidren(headPortraitView);
userHeadImageView = new ImageView()
{
@@ -216,28 +197,22 @@
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
Radius = (uint)Application.GetMinRealAverage(42),
- ImagePath = UserInfo.Current.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,
};
- bodyScrolView.AddChidren(optionListView);
+ bodyView.AddChidren(optionListView);
#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
@@ -270,7 +245,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
+ Text = string.IsNullOrEmpty( UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
};
userNameView.AddChidren(btnUserName);
/// <summary>
@@ -367,7 +342,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = GetBindAccountText(UserInfo.Current.userEmailInfo)
+ Text = GetBindAccountText( UserInfo.Current.userEmailInfo)
};
userEmailInfoView.AddChidren(btnUserEmailInfo);
/// <summary>
@@ -416,7 +391,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = GetBindAccountText(UserInfo.Current.userMobileInfo)
+ Text = GetBindAccountText( UserInfo.Current.userMobileInfo)
};
userPhoneInfoView.AddChidren(btnUserPhoneInfo);
/// <summary>
@@ -502,21 +477,16 @@
#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(66),
+ Height = Application.GetRealHeight(65),
};
- bodyScrolView.AddChidren(interpretationSettingsView);
+ bodyView.AddChidren(interpretationSettingsView);
btnInterpretationSettingsTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -527,7 +497,6 @@
TextID = StringId.InterpretationSettings,
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);
-
btnInterpretationSettingsTip = new Button()
{
X = Application.GetRealWidth(16),
@@ -549,26 +518,6 @@
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()
--
Gitblit v1.8.0