From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs |  239 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 117 insertions(+), 122 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index f014e0b..0a21446 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -254,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()
                 {
@@ -375,9 +375,8 @@
                 };
                 residenceManageView.AddChidren(btnResidenceManageText);
                 #endregion
-#if stage2
 
-#region ---鎴愬憳鍖哄煙
+                #region ---鎴愬憳鍖哄煙
                 residenceMemberView = new FrameLayout()
                 {
                     X = residenceManageView.Right,
@@ -406,8 +405,8 @@
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 };
                 residenceMemberView.AddChidren(btnResidenceMemberText);
-#endregion
-#region ---瀹夋斁鍖哄煙
+                #endregion
+                #region ---瀹夋斁鍖哄煙
                 residenceArmView = new FrameLayout()
                 {
                     X = residenceMemberView.Right,
@@ -435,8 +434,8 @@
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 };
                 residenceArmView.AddChidren(btnResidenceArmText);
-#endregion
-#region ---鏁版嵁澶囦唤鍖哄煙
+                #endregion
+                #region ---鏁版嵁澶囦唤鍖哄煙
                 //residenceDataBackupView = new FrameLayout()
                 //{
                 //    X = Application.GetRealWidth(28 - 24),
@@ -464,9 +463,9 @@
                 //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 //};
                 //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
-#endregion
+                #endregion
 
-#region ---杈呭姪鍔熻兘鍖哄煙
+                #region ---杈呭姪鍔熻兘鍖哄煙
                 residenceAuxiliaryFunctionView = new FrameLayout()
                 {
                     X = Application.GetRealWidth(28 - 24),
@@ -495,9 +494,9 @@
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 };
                 residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
-#endregion
+                #endregion
 
-#region ---娣诲姞鍔熻兘鍖哄煙
+                #region ---娣诲姞鍔熻兘鍖哄煙
                 residenceAddFunctionView = new FrameLayout()
                 {
                     X = residenceAuxiliaryFunctionView.Right,
@@ -525,12 +524,11 @@
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 };
                 residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
-#endregion
-#endif
-                }
+                #endregion
+            }
             else
             {
-#region ---瀹夋斁鍖哄煙
+                #region ---瀹夋斁鍖哄煙
                 residenceArmView = new FrameLayout()
                 {
                     X = Application.GetRealWidth(28 - 24),
@@ -558,8 +556,8 @@
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 };
                 residenceArmView.AddChidren(btnResidenceArmText);
-#endregion
-#region ---鏁版嵁澶囦唤鍖哄煙
+                #endregion
+                #region ---鏁版嵁澶囦唤鍖哄煙
                 //residenceDataBackupView = new FrameLayout()
                 //{
                 //    X = residenceArmView.Right,
@@ -587,9 +585,9 @@
                 //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 //};
                 //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
-#endregion
+                #endregion
 
-#region ---杈呭姪鍔熻兘鍖哄煙
+                #region ---杈呭姪鍔熻兘鍖哄煙
                 residenceAuxiliaryFunctionView = new FrameLayout()
                 {
                     X = residenceArmView.Right,
@@ -617,106 +615,103 @@
                     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
-#endif
+            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 鑾峰彇鏀寔
+            #region 鑾峰彇鏀寔
             supportView = new FrameLayout()
             {
                 Gravity = Gravity.CenterHorizontal,
@@ -805,11 +800,11 @@
             supportView.AddChidren(btnAboutOnRight);
 
 
-#endregion
+            #endregion
 
             contentView.AddChidren(new Button() { Height = Application.GetRealHeight(28) });
 
             LoadEventList();
         }
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0