From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs |  635 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 314 insertions(+), 321 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index f014e0b..33dcfe9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -84,68 +84,59 @@
         /// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
         /// </summary>
         Button btnResidenceMemberText;
-        /// <summary>
-        /// 鍖哄煙瀹夋斁灏忓尯鍩�
-        /// </summary>
-        FrameLayout residenceArmView;
-        /// <summary>
-        /// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
-        /// </summary>
-        Button btnResidenceArmIcon;
-        /// <summary>
-        /// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
-        /// </summary>
-        Button btnResidenceArmText;
+        #region F3闃舵
         ///// <summary>
-        ///// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩�
+        ///// 鍖哄煙瀹夋斁灏忓尯鍩�
         ///// </summary>
-        //FrameLayout residenceDataBackupView;
+        //FrameLayout residenceArmView;
         ///// <summary>
-        ///// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熷浘鏍�
+        ///// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
         ///// </summary>
-        //Button btnResidenceDataBackupIcon;
+        //Button btnResidenceArmIcon;
         ///// <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;
+        //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
 
-        /// <summary>
-        /// 杞欢璁剧疆鍖哄煙
-        /// </summary>
-        FrameLayout softSettingView;
-        /// <summary>
-        /// 杞欢澶滆妯″紡鏂囨湰
-        /// </summary>
-        Button btnNightViewModeText;
-        /// <summary>
-        /// 閫氱敤璁剧疆鏂囨湰
-        /// </summary>
-        Button btnGeneralSettingsText;
-
+        #region F3闃舵
+        ///// <summary>
+        ///// 杞欢璁剧疆鍖哄煙
+        ///// </summary>
+        //FrameLayout softSettingView;
+        ///// <summary>
+        ///// 杞欢澶滆妯″紡鏂囨湰
+        ///// </summary>
+        //Button btnNightViewModeText;
+        ///// <summary>
+        ///// 閫氱敤璁剧疆鏂囨湰
+        ///// </summary>
+        //Button btnGeneralSettingsText;
+        #endregion
         /// <summary>
         /// 鑾峰彇鏀寔灏忓尯鍩�
         /// </summary>
@@ -201,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()
             {
@@ -216,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);
 
@@ -227,15 +217,15 @@
                 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
@@ -244,6 +234,7 @@
             {
                 Y = Application.GetRealHeight(8) + personalInfoView.Bottom,
                 Height = Application.GetRealHeight(400),
+                ScrollEnabled = false
             };
             bodyView.AddChidren(contentView);
             LoadContentView();
@@ -253,8 +244,9 @@
         {
             contentView.RemoveAll();
 
+            #region F3闃舵
             #region 浣忓畢淇℃伅鍖哄煙
-            //if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+            //if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
             //{
             //    residenceInfoView = new FrameLayout()
             //    {
@@ -269,6 +261,7 @@
             //    contentView.AddChidren(residenceInfoView);
             //}
             //else
+            #endregion
             {
                 residenceInfoView = new FrameLayout()
                 {
@@ -303,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);
 
@@ -323,7 +316,7 @@
                 Y = Application.GetRealHeight(15),
                 Width = Application.GetMinRealAverage(20),
                 Height = Application.GetMinRealAverage(20),
-                UnSelectedImagePath = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+                UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
                                     == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
             };
             userTypeView.AddChidren(btnUserTypeIcon);
@@ -336,13 +329,13 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextID = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+                TextID = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
                         == false ? StringId.Administrators : StringId.Member
             };
             userTypeView.AddChidren(btnUserTypeName);
             #endregion
             #region 浣忓畢绠$悊
-            if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
             {
                 #region ---浣忓畢绠$悊鍖哄煙
                 residenceManageView = new FrameLayout()
@@ -375,9 +368,8 @@
                 };
                 residenceManageView.AddChidren(btnResidenceManageText);
                 #endregion
-#if stage2
 
-#region ---鎴愬憳鍖哄煙
+                #region ---鎴愬憳鍖哄煙
                 residenceMemberView = new FrameLayout()
                 {
                     X = residenceManageView.Right,
@@ -406,37 +398,38 @@
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 };
                 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);
-#endregion
-#region ---鏁版嵁澶囦唤鍖哄煙
+                #endregion
+                #region ---瀹夋斁鍖哄煙
+                #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),
@@ -464,102 +457,103 @@
                 //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 //};
                 //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
-#endregion
+                #endregion
 
-#region ---杈呭姪鍔熻兘鍖哄煙
-                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 ---杈呭姪鍔熻兘鍖哄煙
+                //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);
-#endregion
-#endif
-                }
+                #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);
+                #endregion
+                #endregion
+            }
             else
             {
-#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);
-#endregion
-#region ---鏁版嵁澶囦唤鍖哄煙
+                #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);
+                #endregion
+                #region ---鏁版嵁澶囦唤鍖哄煙
                 //residenceDataBackupView = new FrameLayout()
                 //{
                 //    X = residenceArmView.Right,
@@ -587,136 +581,135 @@
                 //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                 //};
                 //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
-#endregion
+                #endregion
 
-#region ---杈呭姪鍔熻兘鍖哄煙
-                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
-
+                #region ---杈呭姪鍔熻兘鍖哄煙
+                //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
 
-#endregion
+            #endregion
 
-            contentView.ScrollEnabled = false;
-#if stage2
+            #region F3闃舵
+            #region 杞欢璁剧疆鍖哄煙
+            //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);
+
+            //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);
+
+            //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);
+
+            //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);
+
+            //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) });
-#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);
-
-                        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);
-
-                        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);
-
-                        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
-            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-#region 鑾峰彇鏀寔
             supportView = new FrameLayout()
             {
                 Gravity = Gravity.CenterHorizontal,
@@ -805,11 +798,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