From a2927467ebfa938a420f392deb6882b35570fd33 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 16:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 199 +++++++++++++++++++++++++++++++++----------------
1 files changed, 135 insertions(+), 64 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 0f6b5af..d888782 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -33,6 +33,10 @@
/// </summary>
ImageView userHeadImageView;
/// <summary>
+ /// 婊氬姩閮ㄥ垎
+ /// </summary>
+ VerticalScrolViewLayout contentView;
+ /// <summary>
/// 浣忓畢淇℃伅鍖哄煙
/// </summary>
FrameLayout residenceInfoView;
@@ -128,42 +132,34 @@
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceAddFunctionText;
+
/// <summary>
/// 杞欢璁剧疆鍖哄煙
/// </summary>
FrameLayout softSettingView;
/// <summary>
- /// 杞欢澶滆妯″紡鍥炬爣
- /// </summary>
- Button btnNightViewModeIcon;
- /// <summary>
/// 杞欢澶滆妯″紡鏂囨湰
/// </summary>
Button btnNightViewModeText;
/// <summary>
- /// 杞欢澶滆妯″紡鎸夐挳
- /// </summary>
- Button btnNightViewModeSwitch;
- /// <summary>
- /// 閫氱敤璁剧疆鍥炬爣
- /// </summary>
- Button btnGeneralSettingsIcon;
- /// <summary>
/// 閫氱敤璁剧疆鏂囨湰
/// </summary>
Button btnGeneralSettingsText;
+
/// <summary>
/// 鑾峰彇鏀寔灏忓尯鍩�
/// </summary>
FrameLayout supportView;
/// <summary>
- /// 鑾峰彇鏀寔鍥炬爣
- /// </summary>
- Button btnSupportIcon;
- /// <summary>
/// 鑾峰彇鏀寔鏂囨湰
/// </summary>
Button btnSupportText;
+
+ /// <summary>
+ /// 鍏充簬On鏂囨湰
+ /// </summary>
+ Button btnAboutOnText;
+
#endregion
public PersonalCenterPage()
@@ -192,7 +188,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(94),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
@@ -205,13 +201,13 @@
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()
{
@@ -220,7 +216,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.LoginUser.accountString
+ Text = UserInfo.Current.AccountString
};
personalInfoView.AddChidren(btnEmail);
@@ -231,49 +227,60 @@
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
+ contentView = new VerticalScrolViewLayout()
+ {
+ Y = Application.GetRealHeight(8) + personalInfoView.Bottom,
+ Height = Application.GetRealHeight(400),
+ };
+ bodyView.AddChidren(contentView);
+ LoadContentView();
+ }
+
+ public void LoadContentView()
+ {
+ contentView.RemoveAll();
+
#region 浣忓畢淇℃伅鍖哄煙
- if (MainPage.LoginUser.accountType == 0)
+ if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
{
residenceInfoView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(8) + personalInfoView.Bottom,
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(213),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
- bodyView.AddChidren(residenceInfoView);
+ contentView.AddChidren(residenceInfoView);
}
else
{
residenceInfoView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(8) + personalInfoView.Bottom,
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(144),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
- bodyView.AddChidren(residenceInfoView);
+ contentView.AddChidren(residenceInfoView);
}
#region 椤堕儴淇℃伅鍖哄煙
@@ -316,7 +323,8 @@
Y = Application.GetRealHeight(15),
Width = Application.GetMinRealAverage(20),
Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = MainPage.LoginUser.accountType == 0 ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
+ UnSelectedImagePath = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+ == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
};
userTypeView.AddChidren(btnUserTypeIcon);
@@ -328,12 +336,13 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.LoginUser.accountType == 0 ? "绠＄悊鍛�" : "鎴愬憳"
+ TextID = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+ == false ? StringId.Administrators : StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
- if (MainPage.LoginUser.accountType == 0)
+ if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
residenceManageView = new FrameLayout()
@@ -366,6 +375,7 @@
};
residenceManageView.AddChidren(btnResidenceManageText);
#endregion
+
#region ---鎴愬憳鍖哄煙
residenceMemberView = new FrameLayout()
{
@@ -612,21 +622,21 @@
#endregion
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
#region 杞欢璁剧疆鍖哄煙
softSettingView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(8) + residenceInfoView.Bottom,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(88),
+ Height = Application.GetRealWidth(88),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
- bodyView.AddChidren(softSettingView);
+ contentView.AddChidren(softSettingView);
- btnNightViewModeIcon = new Button()
+ Button btnNightViewModeIcon = new Button()
{
X = Application.GetRealWidth(12),
Y = Application.GetRealHeight(10),
@@ -639,8 +649,8 @@
btnNightViewModeText = new Button()
{
X = Application.GetRealWidth(48),
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealHeight(44),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
TextID = StringId.NightView,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -648,16 +658,15 @@
};
softSettingView.AddChidren(btnNightViewModeText);
- btnNightViewModeSwitch = new Button()
+ Button btnNightViewModeRight = new Button()
{
- X = Application.GetRealWidth(283),
- Y = Application.GetRealHeight(4),
- Width = Application.GetMinRealAverage(48),
- Height = Application.GetMinRealAverage(36),
- UnSelectedImagePath = "Public/Switch.png",
- SelectedImagePath = "Public/SwitchOn.png",
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(14),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
};
- softSettingView.AddChidren(btnNightViewModeSwitch);
+ softSettingView.AddChidren(btnNightViewModeRight);
var btnSoftSettingViewLine = new Button()
{
@@ -668,10 +677,10 @@
};
softSettingView.AddChidren(btnSoftSettingViewLine);
- btnGeneralSettingsIcon = new Button()
+ Button btnGeneralSettingsIcon = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(54),
+ Y = Application.GetRealWidth(54),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "PersonalCenter/GeneralSettingsIcon.png",
@@ -682,8 +691,8 @@
{
X = Application.GetRealWidth(48),
Y = btnSoftSettingViewLine.Bottom,
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealHeight(44),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
TextID = StringId.GeneralSettings,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -691,24 +700,31 @@
};
softSettingView.AddChidren(btnGeneralSettingsText);
+ Button btnGeneralSettingsRight = new Button()
+ {
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(58),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ softSettingView.AddChidren(btnGeneralSettingsRight);
#endregion
-
-
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
#region 鑾峰彇鏀寔
supportView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(8) + softSettingView.Bottom,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(44),
+ Height = Application.GetRealWidth(88),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(5),
+ Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
};
- bodyView.AddChidren(supportView);
+ contentView.AddChidren(supportView);
- btnSupportIcon = new Button()
+ Button btnSupportIcon = new Button()
{
X = Application.GetRealWidth(12),
Y = Application.GetRealHeight(10),
@@ -721,19 +737,74 @@
btnSupportText = new Button()
{
X = Application.GetRealWidth(48),
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealHeight(44),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
TextID = StringId.GetSupport,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize
};
supportView.AddChidren(btnSupportText);
+ Button btnSupportRight = new Button()
+ {
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(14),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ supportView.AddChidren(btnSupportRight);
+
+
+
+ var btnSupportViewLine = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Y = btnSupportText.Bottom,
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.DividingLineColor
+ };
+ supportView.AddChidren(btnSupportViewLine);
+
+ Button btnAboutOnIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(54),
+ Width = Application.GetMinRealAverage(24),
+ Height = Application.GetMinRealAverage(24),
+ UnSelectedImagePath = "PersonalCenter/InfoOnIcon.png",
+ };
+ supportView.AddChidren(btnAboutOnIcon);
+
+ btnAboutOnText = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Y = btnSupportViewLine.Bottom,
+ Width = Application.GetRealWidth(370),
+ Height = Application.GetRealWidth(44),
+ TextID = StringId.AboutOn,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize
+ };
+ supportView.AddChidren(btnAboutOnText);
+
+ Button btnAboutOnRight = new Button()
+ {
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(58),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ supportView.AddChidren(btnAboutOnRight);
+
#endregion
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(28) });
LoadEventList();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0