From e322d91c7325019710bfdb046c5fea673031455a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 29 七月 2020 11:53:01 +0800
Subject: [PATCH] 20200729

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs |  149 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 107 insertions(+), 42 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 7025ad9..1ec1302 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;
@@ -133,37 +137,28 @@
         /// </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()
@@ -244,13 +239,19 @@
 
             #endregion
 
+            contentView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(8) + personalInfoView.Bottom,
+                Height = Application.GetRealHeight(400),
+            };
+            bodyView.AddChidren(contentView);
+
             #region 浣忓畢淇℃伅鍖哄煙
             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,
@@ -258,14 +259,13 @@
                     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,
@@ -273,7 +273,7 @@
                     BorderColor = 0x00FFFFFF,
                     BorderWidth = 0,
                 };
-                bodyView.AddChidren(residenceInfoView);
+                contentView.AddChidren(residenceInfoView);
 
             }
             #region 椤堕儴淇℃伅鍖哄煙
@@ -329,8 +329,8 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
-                        == false ? "绠$悊鍛�" : "鎴愬憳"
+                TextID = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+                        == false ? StringId.Administrators : StringId.Member
             };
             userTypeView.AddChidren(btnUserTypeName);
             #endregion
@@ -614,21 +614,22 @@
 
             #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),
                 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),
@@ -641,7 +642,7 @@
             btnNightViewModeText = new Button()
             {
                 X = Application.GetRealWidth(48),
-                Width = Application.GetRealWidth(180),
+                Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(44),
                 TextID = StringId.NightView,
                 TextColor = CSS_Color.FirstLevelTitleColor,
@@ -650,16 +651,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()
             {
@@ -670,7 +670,7 @@
             };
             softSettingView.AddChidren(btnSoftSettingViewLine);
 
-            btnGeneralSettingsIcon = new Button()
+            Button btnGeneralSettingsIcon = new Button()
             {
                 X = Application.GetRealWidth(12),
                 Y = Application.GetRealHeight(54),
@@ -684,7 +684,7 @@
             {
                 X = Application.GetRealWidth(48),
                 Y = btnSoftSettingViewLine.Bottom,
-                Width = Application.GetRealWidth(180),
+                Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(44),
                 TextID = StringId.GeneralSettings,
                 TextColor = CSS_Color.FirstLevelTitleColor,
@@ -693,23 +693,32 @@
             };
             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),
                 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),
@@ -722,7 +731,7 @@
             btnSupportText = new Button()
             {
                 X = Application.GetRealWidth(48),
-                Width = Application.GetRealWidth(180),
+                Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(44),
                 TextID = StringId.GetSupport,
                 TextColor = CSS_Color.FirstLevelTitleColor,
@@ -730,9 +739,65 @@
                 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 = btnNightViewModeText.Bottom,
+                Height = Application.GetRealHeight(1),
+                BackgroundColor = CSS_Color.DividingLineColor
+            };
+            supportView.AddChidren(btnSupportViewLine);
+
+            Button btnAboutOnIcon = new Button()
+            {
+                X = Application.GetRealWidth(12),
+                Y = Application.GetRealHeight(54),
+                Width = Application.GetMinRealAverage(24),
+                Height = Application.GetMinRealAverage(24),
+                UnSelectedImagePath = "PersonalCenter/InfoOnIcon.png",
+            };
+            supportView.AddChidren(btnAboutOnIcon);
+
+            btnAboutOnText = new Button()
+            {
+                X = Application.GetRealWidth(48),
+                Y = btnSoftSettingViewLine.Bottom,
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(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();
         }
     }

--
Gitblit v1.8.0