From 6d3ba9484472d090532434e53667c096652149ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 25 九月 2020 09:56:14 +0800
Subject: [PATCH] 202009251
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 247 +++++++++++++++++++++++++------------------------
1 files changed, 126 insertions(+), 121 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index aace3fc..f014e0b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -132,6 +132,7 @@
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceAddFunctionText;
+
/// <summary>
/// 杞欢璁剧疆鍖哄煙
/// </summary>
@@ -253,21 +254,21 @@
contentView.RemoveAll();
#region 浣忓畢淇℃伅鍖哄煙
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
- residenceInfoView = new FrameLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(213),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 0,
- };
- contentView.AddChidren(residenceInfoView);
- }
- else
+ //if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ //{
+ // residenceInfoView = new FrameLayout()
+ // {
+ // Gravity = Gravity.CenterHorizontal,
+ // Width = Application.GetRealWidth(343),
+ // Height = Application.GetRealHeight(213),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ // Radius = (uint)Application.GetRealHeight(12),
+ // BorderColor = 0x00FFFFFF,
+ // BorderWidth = 0,
+ // };
+ // contentView.AddChidren(residenceInfoView);
+ //}
+ //else
{
residenceInfoView = new FrameLayout()
{
@@ -374,7 +375,9 @@
};
residenceManageView.AddChidren(btnResidenceManageText);
#endregion
- #region ---鎴愬憳鍖哄煙
+#if stage2
+
+#region ---鎴愬憳鍖哄煙
residenceMemberView = new FrameLayout()
{
X = residenceManageView.Right,
@@ -403,8 +406,8 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
residenceMemberView.AddChidren(btnResidenceMemberText);
- #endregion
- #region ---瀹夋斁鍖哄煙
+#endregion
+#region ---瀹夋斁鍖哄煙
residenceArmView = new FrameLayout()
{
X = residenceMemberView.Right,
@@ -432,8 +435,8 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
residenceArmView.AddChidren(btnResidenceArmText);
- #endregion
- #region ---鏁版嵁澶囦唤鍖哄煙
+#endregion
+#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
//{
// X = Application.GetRealWidth(28 - 24),
@@ -461,9 +464,9 @@
// TextSize = CSS_FontSize.PromptFontSize_FirstLevel
//};
//residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
- #endregion
+#endregion
- #region ---杈呭姪鍔熻兘鍖哄煙
+#region ---杈呭姪鍔熻兘鍖哄煙
residenceAuxiliaryFunctionView = new FrameLayout()
{
X = Application.GetRealWidth(28 - 24),
@@ -492,9 +495,9 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
- #endregion
+#endregion
- #region ---娣诲姞鍔熻兘鍖哄煙
+#region ---娣诲姞鍔熻兘鍖哄煙
residenceAddFunctionView = new FrameLayout()
{
X = residenceAuxiliaryFunctionView.Right,
@@ -522,11 +525,12 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
- #endregion
- }
+#endregion
+#endif
+ }
else
{
- #region ---瀹夋斁鍖哄煙
+#region ---瀹夋斁鍖哄煙
residenceArmView = new FrameLayout()
{
X = Application.GetRealWidth(28 - 24),
@@ -554,8 +558,8 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
residenceArmView.AddChidren(btnResidenceArmText);
- #endregion
- #region ---鏁版嵁澶囦唤鍖哄煙
+#endregion
+#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
//{
// X = residenceArmView.Right,
@@ -583,9 +587,9 @@
// TextSize = CSS_FontSize.PromptFontSize_FirstLevel
//};
//residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
- #endregion
+#endregion
- #region ---杈呭姪鍔熻兘鍖哄煙
+#region ---杈呭姪鍔熻兘鍖哄煙
residenceAuxiliaryFunctionView = new FrameLayout()
{
X = residenceArmView.Right,
@@ -613,105 +617,106 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
- #endregion
+#endregion
}
- #endregion
+#endregion
- #endregion
+#endregion
+ contentView.ScrollEnabled = false;
+#if stage2
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+#region 杞欢璁剧疆鍖哄煙
+ softSettingView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealWidth(88),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 0,
+ };
+ contentView.AddChidren(softSettingView);
- #region 杞欢璁剧疆鍖哄煙
- softSettingView = new FrameLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealWidth(88),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 0,
- };
- contentView.AddChidren(softSettingView);
+ Button btnNightViewModeIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetMinRealAverage(24),
+ Height = Application.GetMinRealAverage(24),
+ UnSelectedImagePath = "PersonalCenter/NightViewIcon.png",
+ };
+ softSettingView.AddChidren(btnNightViewModeIcon);
- Button btnNightViewModeIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(10),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "PersonalCenter/NightViewIcon.png",
- };
- softSettingView.AddChidren(btnNightViewModeIcon);
+ btnNightViewModeText = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
+ TextID = StringId.NightView,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ softSettingView.AddChidren(btnNightViewModeText);
- btnNightViewModeText = new Button()
- {
- X = Application.GetRealWidth(48),
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealWidth(44),
- TextID = StringId.NightView,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- TextAlignment = TextAlignment.CenterLeft,
- };
- softSettingView.AddChidren(btnNightViewModeText);
+ Button btnNightViewModeRight = new Button()
+ {
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(14),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ softSettingView.AddChidren(btnNightViewModeRight);
- Button btnNightViewModeRight = new Button()
- {
- X = Application.GetRealWidth(315),
- Y = Application.GetRealWidth(14),
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- softSettingView.AddChidren(btnNightViewModeRight);
+ var btnSoftSettingViewLine = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Y = btnNightViewModeText.Bottom,
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS_Color.DividingLineColor
+ };
+ softSettingView.AddChidren(btnSoftSettingViewLine);
- var btnSoftSettingViewLine = new Button()
- {
- X = Application.GetRealWidth(48),
- Y = btnNightViewModeText.Bottom,
- Height = Application.GetRealHeight(1),
- BackgroundColor = CSS_Color.DividingLineColor
- };
- softSettingView.AddChidren(btnSoftSettingViewLine);
+ Button btnGeneralSettingsIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(54),
+ Width = Application.GetMinRealAverage(24),
+ Height = Application.GetMinRealAverage(24),
+ UnSelectedImagePath = "PersonalCenter/GeneralSettingsIcon.png",
+ };
+ softSettingView.AddChidren(btnGeneralSettingsIcon);
- Button btnGeneralSettingsIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(54),
- Width = Application.GetMinRealAverage(24),
- Height = Application.GetMinRealAverage(24),
- UnSelectedImagePath = "PersonalCenter/GeneralSettingsIcon.png",
- };
- softSettingView.AddChidren(btnGeneralSettingsIcon);
+ btnGeneralSettingsText = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Y = btnSoftSettingViewLine.Bottom,
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
+ TextID = StringId.GeneralSettings,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize
+ };
+ softSettingView.AddChidren(btnGeneralSettingsText);
- btnGeneralSettingsText = new Button()
- {
- X = Application.GetRealWidth(48),
- Y = btnSoftSettingViewLine.Bottom,
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealWidth(44),
- TextID = StringId.GeneralSettings,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize
- };
- 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
-
+ 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
+#endif
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
- #region 鑾峰彇鏀寔
+#region 鑾峰彇鏀寔
supportView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
@@ -760,7 +765,7 @@
var btnSupportViewLine = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnNightViewModeText.Bottom,
+ Y = btnSupportText.Bottom,
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor
};
@@ -779,8 +784,8 @@
btnAboutOnText = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnSoftSettingViewLine.Bottom,
- Width = Application.GetRealWidth(270),
+ Y = btnSupportViewLine.Bottom,
+ Width = Application.GetRealWidth(370),
Height = Application.GetRealWidth(44),
TextID = StringId.AboutOn,
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -800,7 +805,7 @@
supportView.AddChidren(btnAboutOnRight);
- #endregion
+#endregion
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(28) });
--
Gitblit v1.8.0