From d724f7f21c5cc8c5dd5aa0cf7345a62a662eb2bf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 16 十二月 2020 15:12:18 +0800
Subject: [PATCH] 2020-12-16 1.子账号和解锁部分接口增加Loading处理

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs |  830 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 450 insertions(+), 380 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index f3ccc06..33dcfe9 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;
@@ -80,90 +84,73 @@
         /// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
         /// </summary>
         Button btnResidenceMemberText;
-        /// <summary>
-        /// 鍖哄煙瀹夋斁灏忓尯鍩�
-        /// </summary>
-        FrameLayout residenceArmView;
-        /// <summary>
-        /// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
-        /// </summary>
-        Button btnResidenceArmIcon;
-        /// <summary>
-        /// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
-        /// </summary>
-        Button btnResidenceArmText;
-        /// <summary>
-        /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩�
-        /// </summary>
-        FrameLayout residenceDataBackupView;
-        /// <summary>
-        /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熷浘鏍�
-        /// </summary>
-        Button btnResidenceDataBackupIcon;
-        /// <summary>
-        /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熸枃鏈�
-        /// </summary>
-        Button btnResidenceDataBackupText;
-        /// <summary>
-        /// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩�
-        /// </summary>
-        FrameLayout residenceAuxiliaryFunctionView;
-        /// <summary>
-        /// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熷浘鏍�
-        /// </summary>
-        Button btnResidenceAuxiliaryFunctionIcon;
-        /// <summary>
-        /// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熸枃鏈�
-        /// </summary>
-        Button btnResidenceAuxiliaryFunctionText;
-        /// <summary>
-        /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩�
-        /// </summary>
-        FrameLayout residenceAddFunctionView;
-        /// <summary>
-        /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熷浘鏍�
-        /// </summary>
-        Button btnResidenceAddFunctionIcon;
-        /// <summary>
-        /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
-        /// </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;
+        #region F3闃舵
+        ///// <summary>
+        ///// 鍖哄煙瀹夋斁灏忓尯鍩�
+        ///// </summary>
+        //FrameLayout residenceArmView;
+        ///// <summary>
+        ///// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
+        ///// </summary>
+        //Button btnResidenceArmIcon;
+        ///// <summary>
+        ///// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
+        ///// </summary>
+        //Button btnResidenceArmText;
+        ///// <summary>
+        ///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩�
+        ///// </summary>
+        //FrameLayout residenceAuxiliaryFunctionView;
+        ///// <summary>
+        ///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熷浘鏍�
+        ///// </summary>
+        //Button btnResidenceAuxiliaryFunctionIcon;
+        ///// <summary>
+        ///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熸枃鏈�
+        ///// </summary>
+        //Button btnResidenceAuxiliaryFunctionText;
+        ///// <summary>
+        ///// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩�
+        ///// </summary>
+        //FrameLayout residenceAddFunctionView;
+        ///// <summary>
+        ///// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熷浘鏍�
+        ///// </summary>
+        //Button btnResidenceAddFunctionIcon;
+        ///// <summary>
+        ///// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
+        ///// </summary>
+        //Button btnResidenceAddFunctionText;
+        #endregion
+
+        #region F3闃舵
+        ///// <summary>
+        ///// 杞欢璁剧疆鍖哄煙
+        ///// </summary>
+        //FrameLayout softSettingView;
+        ///// <summary>
+        ///// 杞欢澶滆妯″紡鏂囨湰
+        ///// </summary>
+        //Button btnNightViewModeText;
+        ///// <summary>
+        ///// 閫氱敤璁剧疆鏂囨湰
+        ///// </summary>
+        //Button btnGeneralSettingsText;
+        #endregion
         /// <summary>
         /// 鑾峰彇鏀寔灏忓尯鍩�
         /// </summary>
         FrameLayout supportView;
         /// <summary>
-        /// 鑾峰彇鏀寔鍥炬爣
-        /// </summary>
-        Button btnSupportIcon;
-        /// <summary>
         /// 鑾峰彇鏀寔鏂囨湰
         /// </summary>
         Button btnSupportText;
+
+        /// <summary>
+        /// 鍏充簬On鏂囨湰
+        /// </summary>
+        Button btnAboutOnText;
+
         #endregion
 
         public PersonalCenterPage()
@@ -192,7 +179,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 +192,12 @@
                 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 +206,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 +217,63 @@
                 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),
+                ScrollEnabled = false
+            };
+            bodyView.AddChidren(contentView);
+            LoadContentView();
+        }
+
+        public void LoadContentView()
+        {
+            contentView.RemoveAll();
+
+            #region F3闃舵
             #region 浣忓畢淇℃伅鍖哄煙
-            if (MainPage.LoginUser.accountType == 0)
+            //if (!DB_ResidenceData.Instance.CurrentRegion.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
+            #endregion
             {
                 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),
-                    BorderColor = 0x00FFFFFF,
-                    BorderWidth = 0,
-                };
-                bodyView.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 椤堕儴淇℃伅鍖哄煙
@@ -296,7 +296,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
-                Text = DB_ResidenceData.residenceData.residecenInfo.Name,
+                Text = DB_ResidenceData.Instance.CurrentRegion.Name,
             };
             residenceInfoView.AddChidren(btnCurResidenceName);
 
@@ -316,7 +316,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.Instance.CurrentRegion.IsOthreShare
+                                    == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
             };
             userTypeView.AddChidren(btnUserTypeIcon);
 
@@ -328,12 +329,13 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = MainPage.LoginUser.accountType == 0 ? "绠$悊鍛�" : "鎴愬憳"
+                TextID = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
+                        == false ? StringId.Administrators : StringId.Member
             };
             userTypeView.AddChidren(btnUserTypeName);
             #endregion
             #region 浣忓畢绠$悊
-            if (MainPage.LoginUser.accountType == 0)
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
             {
                 #region ---浣忓畢绠$悊鍖哄煙
                 residenceManageView = new FrameLayout()
@@ -366,6 +368,7 @@
                 };
                 residenceManageView.AddChidren(btnResidenceManageText);
                 #endregion
+
                 #region ---鎴愬憳鍖哄煙
                 residenceMemberView = new FrameLayout()
                 {
@@ -397,317 +400,329 @@
                 residenceMemberView.AddChidren(btnResidenceMemberText);
                 #endregion
                 #region ---瀹夋斁鍖哄煙
-                residenceArmView = new FrameLayout()
-                {
-                    X = residenceMemberView.Right,
-                    Y = Application.GetRealHeight(68),
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealHeight(64),
-                };
-                residenceInfoView.AddChidren(residenceArmView);
-                btnResidenceArmIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
-                };
-                residenceArmView.AddChidren(btnResidenceArmIcon);
-                btnResidenceArmText = new Button()
-                {
-                    Y = btnResidenceManageIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.Undefense,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceArmView.AddChidren(btnResidenceArmText);
+                #region F3闃舵
+                //residenceArmView = new FrameLayout()
+                //{
+                //    X = residenceMemberView.Right,
+                //    Y = Application.GetRealHeight(68),
+                //    Width = Application.GetRealWidth(64 + 48),
+                //    Height = Application.GetRealHeight(64),
+                //};
+                //residenceInfoView.AddChidren(residenceArmView);
+                //btnResidenceArmIcon = new Button
+                //{
+                //    Gravity = Gravity.CenterHorizontal,
+                //    Y = Application.GetRealHeight(5),
+                //    Width = Application.GetMinRealAverage(30),
+                //    Height = Application.GetMinRealAverage(30),
+                //    UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+                //};
+                //residenceArmView.AddChidren(btnResidenceArmIcon);
+                //btnResidenceArmText = new Button()
+                //{
+                //    Y = btnResidenceManageIcon.Bottom,
+                //    Height = Application.GetRealHeight(29),
+                //    TextID = StringId.Undefense,
+                //    TextAlignment = TextAlignment.Center,
+                //    TextColor = CSS_Color.FirstLevelTitleColor,
+                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                //};
+                //residenceArmView.AddChidren(btnResidenceArmText);
                 #endregion
                 #region ---鏁版嵁澶囦唤鍖哄煙
-                residenceDataBackupView = new FrameLayout()
-                {
-                    X = Application.GetRealWidth(28 - 24),
-                    Y = residenceManageView.Bottom,
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealWidth(64),
-                };
-                residenceInfoView.AddChidren(residenceDataBackupView);
-                btnResidenceDataBackupIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
-                };
-                residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
-                btnResidenceDataBackupText = new Button()
-                {
-                    Y = btnResidenceManageIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.DataBackup,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
+                //residenceDataBackupView = new FrameLayout()
+                //{
+                //    X = Application.GetRealWidth(28 - 24),
+                //    Y = residenceManageView.Bottom,
+                //    Width = Application.GetRealWidth(64 + 48),
+                //    Height = Application.GetRealWidth(64),
+                //};
+                //residenceInfoView.AddChidren(residenceDataBackupView);
+                //btnResidenceDataBackupIcon = new Button
+                //{
+                //    Gravity = Gravity.CenterHorizontal,
+                //    Y = Application.GetRealHeight(5),
+                //    Width = Application.GetMinRealAverage(30),
+                //    Height = Application.GetMinRealAverage(30),
+                //    UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
+                //};
+                //residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
+                //btnResidenceDataBackupText = new Button()
+                //{
+                //    Y = btnResidenceManageIcon.Bottom,
+                //    Height = Application.GetRealHeight(29),
+                //    TextID = StringId.DataBackup,
+                //    TextAlignment = TextAlignment.Center,
+                //    TextColor = CSS_Color.FirstLevelTitleColor,
+                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                //};
+                //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
                 #endregion
 
                 #region ---杈呭姪鍔熻兘鍖哄煙
-                residenceAuxiliaryFunctionView = new FrameLayout()
-                {
-                    X = residenceDataBackupView.Right,
-                    Y = residenceManageView.Bottom,
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealWidth(64),
-                };
-                residenceInfoView.AddChidren(residenceAuxiliaryFunctionView);
-                btnResidenceAuxiliaryFunctionIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png",
-                };
-                residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon);
-                btnResidenceAuxiliaryFunctionText = new Button()
-                {
-                    Y = btnResidenceManageIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.AuxiliaryFunction,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
+                //residenceAuxiliaryFunctionView = new FrameLayout()
+                //{
+                //    X = Application.GetRealWidth(28 - 24),
+                //    //X = residenceDataBackupView.Right,
+                //    Y = residenceManageView.Bottom,
+                //    Width = Application.GetRealWidth(64 + 48),
+                //    Height = Application.GetRealWidth(64),
+                //};
+                //residenceInfoView.AddChidren(residenceAuxiliaryFunctionView);
+                //btnResidenceAuxiliaryFunctionIcon = new Button
+                //{
+                //    Gravity = Gravity.CenterHorizontal,
+                //    Y = Application.GetRealHeight(5),
+                //    Width = Application.GetMinRealAverage(30),
+                //    Height = Application.GetMinRealAverage(30),
+                //    UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png",
+                //};
+                //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon);
+                //btnResidenceAuxiliaryFunctionText = new Button()
+                //{
+                //    Y = btnResidenceManageIcon.Bottom,
+                //    Height = Application.GetRealHeight(29),
+                //    TextID = StringId.AuxiliaryFunction,
+                //    TextAlignment = TextAlignment.Center,
+                //    TextColor = CSS_Color.FirstLevelTitleColor,
+                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                //};
+                //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
                 #endregion
 
                 #region ---娣诲姞鍔熻兘鍖哄煙
-                residenceAddFunctionView = new FrameLayout()
-                {
-                    X = residenceAuxiliaryFunctionView.Right,
-                    Y = residenceManageView.Bottom,
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealWidth(64),
-                };
-                residenceInfoView.AddChidren(residenceAddFunctionView);
-                btnResidenceAddFunctionIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
-                };
-                residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
-                btnResidenceAddFunctionText = new Button()
-                {
-                    Y = btnResidenceManageIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.AddFunction,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
+                //residenceAddFunctionView = new FrameLayout()
+                //{
+                //    X = residenceAuxiliaryFunctionView.Right,
+                //    Y = residenceManageView.Bottom,
+                //    Width = Application.GetRealWidth(64 + 48),
+                //    Height = Application.GetRealWidth(64),
+                //};
+                //residenceInfoView.AddChidren(residenceAddFunctionView);
+                //btnResidenceAddFunctionIcon = new Button
+                //{
+                //    Gravity = Gravity.CenterHorizontal,
+                //    Y = Application.GetRealHeight(5),
+                //    Width = Application.GetMinRealAverage(30),
+                //    Height = Application.GetMinRealAverage(30),
+                //    UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
+                //};
+                //residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
+                //btnResidenceAddFunctionText = new Button()
+                //{
+                //    Y = btnResidenceManageIcon.Bottom,
+                //    Height = Application.GetRealHeight(29),
+                //    TextID = StringId.AddFunction,
+                //    TextAlignment = TextAlignment.Center,
+                //    TextColor = CSS_Color.FirstLevelTitleColor,
+                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                //};
+                //residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
+                #endregion
                 #endregion
             }
             else
             {
+                #region F3闃舵
                 #region ---瀹夋斁鍖哄煙
-                residenceArmView = new FrameLayout()
-                {
-                    X = Application.GetRealWidth(28 - 24),
-                    Y = Application.GetRealHeight(68),
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealWidth(64),
-                };
-                residenceInfoView.AddChidren(residenceArmView);
-                btnResidenceArmIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
-                };
-                residenceArmView.AddChidren(btnResidenceArmIcon);
-                btnResidenceArmText = new Button()
-                {
-                    Y = btnResidenceArmIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.Undefense,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceArmView.AddChidren(btnResidenceArmText);
+                //residenceArmView = new FrameLayout()
+                //{
+                //    X = Application.GetRealWidth(28 - 24),
+                //    Y = Application.GetRealHeight(68),
+                //    Width = Application.GetRealWidth(64 + 48),
+                //    Height = Application.GetRealWidth(64),
+                //};
+                //residenceInfoView.AddChidren(residenceArmView);
+                //btnResidenceArmIcon = new Button
+                //{
+                //    Gravity = Gravity.CenterHorizontal,
+                //    Y = Application.GetRealHeight(5),
+                //    Width = Application.GetMinRealAverage(30),
+                //    Height = Application.GetMinRealAverage(30),
+                //    UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+                //};
+                //residenceArmView.AddChidren(btnResidenceArmIcon);
+                //btnResidenceArmText = new Button()
+                //{
+                //    Y = btnResidenceArmIcon.Bottom,
+                //    Height = Application.GetRealHeight(29),
+                //    TextID = StringId.Undefense,
+                //    TextAlignment = TextAlignment.Center,
+                //    TextColor = CSS_Color.FirstLevelTitleColor,
+                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                //};
+                //residenceArmView.AddChidren(btnResidenceArmText);
                 #endregion
                 #region ---鏁版嵁澶囦唤鍖哄煙
-                residenceDataBackupView = new FrameLayout()
-                {
-                    X = residenceArmView.Right,
-                    Y = Application.GetRealHeight(68),
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealWidth(64),
-                };
-                residenceInfoView.AddChidren(residenceDataBackupView);
-                btnResidenceDataBackupIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
-                };
-                residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
-                btnResidenceDataBackupText = new Button()
-                {
-                    Y = btnResidenceDataBackupIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.DataBackup,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
+                //residenceDataBackupView = new FrameLayout()
+                //{
+                //    X = residenceArmView.Right,
+                //    Y = Application.GetRealHeight(68),
+                //    Width = Application.GetRealWidth(64 + 48),
+                //    Height = Application.GetRealWidth(64),
+                //};
+                //residenceInfoView.AddChidren(residenceDataBackupView);
+                //btnResidenceDataBackupIcon = new Button
+                //{
+                //    Gravity = Gravity.CenterHorizontal,
+                //    Y = Application.GetRealHeight(5),
+                //    Width = Application.GetMinRealAverage(30),
+                //    Height = Application.GetMinRealAverage(30),
+                //    UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
+                //};
+                //residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
+                //btnResidenceDataBackupText = new Button()
+                //{
+                //    Y = btnResidenceDataBackupIcon.Bottom,
+                //    Height = Application.GetRealHeight(29),
+                //    TextID = StringId.DataBackup,
+                //    TextAlignment = TextAlignment.Center,
+                //    TextColor = CSS_Color.FirstLevelTitleColor,
+                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                //};
+                //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
                 #endregion
 
                 #region ---杈呭姪鍔熻兘鍖哄煙
-                residenceAuxiliaryFunctionView = new FrameLayout()
-                {
-                    X = residenceDataBackupView.Right,
-                    Y = Application.GetRealHeight(68),
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealWidth(64),
-                };
-                residenceInfoView.AddChidren(residenceAuxiliaryFunctionView);
-                btnResidenceAuxiliaryFunctionIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png",
-                };
-                residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon);
-                btnResidenceAuxiliaryFunctionText = new Button()
-                {
-                    Y = btnResidenceAuxiliaryFunctionIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.AuxiliaryFunction,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
+                //residenceAuxiliaryFunctionView = new FrameLayout()
+                //{
+                //    X = residenceArmView.Right,
+                //    Y = Application.GetRealHeight(68),
+                //    Width = Application.GetRealWidth(64 + 48),
+                //    Height = Application.GetRealWidth(64),
+                //};
+                //residenceInfoView.AddChidren(residenceAuxiliaryFunctionView);
+                //btnResidenceAuxiliaryFunctionIcon = new Button
+                //{
+                //    Gravity = Gravity.CenterHorizontal,
+                //    Y = Application.GetRealHeight(5),
+                //    Width = Application.GetMinRealAverage(30),
+                //    Height = Application.GetMinRealAverage(30),
+                //    UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png",
+                //};
+                //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon);
+                //btnResidenceAuxiliaryFunctionText = new Button()
+                //{
+                //    Y = btnResidenceAuxiliaryFunctionIcon.Bottom,
+                //    Height = Application.GetRealHeight(29),
+                //    TextID = StringId.AuxiliaryFunction,
+                //    TextAlignment = TextAlignment.Center,
+                //    TextColor = CSS_Color.FirstLevelTitleColor,
+                //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                //};
+                //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
                 #endregion
-
+                #endregion
             }
             #endregion
 
             #endregion
 
+            #region F3闃舵
             #region 杞欢璁剧疆鍖哄煙
-            softSettingView = new FrameLayout()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(8) + residenceInfoView.Bottom,
-                Width = Application.GetRealWidth(343),
-                Height = Application.GetRealHeight(88),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-                Radius = (uint)Application.GetRealHeight(5),
-                BorderColor = 0x00FFFFFF,
-                BorderWidth = 0,
-            };
-            bodyView.AddChidren(softSettingView);
+            //contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+            //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);
 
-            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(180),
-                Height = Application.GetRealHeight(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);
 
-            btnNightViewModeSwitch = 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",
-            };
-            softSettingView.AddChidren(btnNightViewModeSwitch);
+            //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);
 
-            btnGeneralSettingsIcon = new Button()
-            {
-                X = Application.GetRealWidth(12),
-                Y = Application.GetRealHeight(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(180),
-                Height = Application.GetRealHeight(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
-
-
+            #endregion
             #region 鑾峰彇鏀寔
+            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
             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),
@@ -720,19 +735,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