Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-08-27 eda3fb873e59544ff36301b51e05aef64f87b0f9

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs

@@ -97,29 +97,17 @@
        /// </summary>
        Button btnResidenceArmText;
        ///// <summary>
        ///// 区域数据备份小区域
        ///// 区域辅助功能小区域
        ///// </summary>
        //FrameLayout residenceDataBackupView;
        //FrameLayout residenceAuxiliaryFunctionView;
        ///// <summary>
        ///// 区域数据备份小区域图标
        ///// 区域辅助功能小区域图标
        ///// </summary>
        //Button btnResidenceDataBackupIcon;
        //Button btnResidenceAuxiliaryFunctionIcon;
        ///// <summary>
        ///// 区域数据备份小区域文本
        ///// 区域辅助功能小区域文本
        ///// </summary>
        //Button btnResidenceDataBackupText;
        /// <summary>
        /// 区域辅助功能小区域
        /// </summary>
        FrameLayout residenceAuxiliaryFunctionView;
        /// <summary>
        /// 区域辅助功能小区域图标
        /// </summary>
        Button btnResidenceAuxiliaryFunctionIcon;
        /// <summary>
        /// 区域辅助功能小区域文本
        /// </summary>
        Button btnResidenceAuxiliaryFunctionText;
        //Button btnResidenceAuxiliaryFunctionText;
        /// <summary>
        /// 区域添加功能小区域
        /// </summary>
@@ -133,23 +121,23 @@
        /// </summary>
        Button btnResidenceAddFunctionText;

        /// <summary>
        /// 软件设置区域
        /// </summary>
        FrameLayout softSettingView;
        /// <summary>
        /// 软件夜览模式文本
        /// </summary>
        Button btnNightViewModeText;
        /// <summary>
        /// 通用设置文本
        /// </summary>
        Button btnGeneralSettingsText;

        ///// <summary>
        ///// 软件设置区域
        ///// </summary>
        //FrameLayout softSettingView;
        ///// <summary>
        ///// 软件夜览模式文本
        ///// </summary>
        //Button btnNightViewModeText;
        ///// <summary>
        ///// 通用设置文本
        ///// </summary>
        //Button btnGeneralSettingsText;
        #endregion
        /// <summary>
        /// 获取支持小区域
        /// </summary>
        FrameLayout supportView;
        VerticalScrolViewLayout supportView;
        /// <summary>
        /// 获取支持文本
        /// </summary>
@@ -159,8 +147,11 @@
        /// 关于On文本
        /// </summary>
        Button btnAboutOnText;
        /// <summary>
        /// 智能音箱文本
        /// </summary>
        Button btnSmartSpeakerText;

        #endregion

        public PersonalCenterPage()
        {
@@ -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 = UserInfo.Current.userName// 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) && UserInfo.Current.userName == UserInfo.Current.AccountString)
            {
                btnUserName.Text = MainPage.LoginUser.userName; ;
                btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
            }
            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,23 +217,61 @@
                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

            //体验模式
            if(MainPage.NoLoginMode)
            {
                Button btnExit = new Button()
                {
                    Y = Application.GetRealHeight(288) + personalInfoView.Bottom,
                    Gravity = Gravity.CenterHorizontal,
                    Height = Application.GetRealHeight(60),
                    Width = Application.GetRealWidth(330),
                    TextAlignment = TextAlignment.Center,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextColor = CSS_Color.WarningColor,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextID = StringId.NextStep,
                    Radius = 10,
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                    SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
                };
                if(Language.CurrentLanguage =="Chinese")
                {
                    btnExit.Text = "退出体验模式";
                }
                else
                {
                    btnExit.Text = "Exit dome";
                }
                btnExit.MouseUpEventHandler = (sender, e) =>
                {
                    MainPage.NoLoginMode = false;
                    UserInfo.Current.ClearUserInfo();
                    HDLCommon.Current.Logout();
                };
                bodyView.AddChidren(btnExit);
                return;
            }

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(8) + personalInfoView.Bottom,

                Height = Application.GetRealHeight(400),
                ScrollEnabled = false
            };
            bodyView.AddChidren(contentView);
            LoadContentView();
@@ -254,21 +282,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.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
            {
                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()
                {
@@ -303,7 +331,8 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                Text = DB_ResidenceData.residenceData.residecenInfo.Name,
                Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
                IsBold = true
            };
            residenceInfoView.AddChidren(btnCurResidenceName);

@@ -316,6 +345,12 @@
                BackgroundImagePath = "PersonalCenter/UserTypebg.png",
            };
            residenceInfoView.AddChidren(userTypeView);
            if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                userTypeView.X = Application.GetRealWidth(200);
                userTypeView.Width = Application.GetRealWidth(180);
                userTypeView.BackgroundImagePath = "PersonalCenter/UserTypebg2.png";
            }

            btnUserTypeIcon = new Button()
            {
@@ -323,26 +358,26 @@
                Y = Application.GetRealHeight(15),
                Width = Application.GetMinRealAverage(20),
                Height = Application.GetMinRealAverage(20),
                UnSelectedImagePath = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
                UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
                                    == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
            };
            userTypeView.AddChidren(btnUserTypeIcon);

            btnUserTypeName = new Button()
            {
                X = Application.GetRealWidth(8) + btnUserTypeIcon.Right,
                Width = Application.GetRealWidth(80),
                Width = Application.GetRealWidth(270),
                Height = Application.GetRealHeight(17 * 3),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
                TextID = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
                        == false ? StringId.Administrators : StringId.Member
            };
            userTypeView.AddChidren(btnUserTypeName);
            #endregion
            #region 住宅管理
            if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)

            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                #region ---住宅管理区域
                residenceManageView = new FrameLayout()
@@ -375,9 +410,8 @@
                };
                residenceManageView.AddChidren(btnResidenceManageText);
                #endregion
#if stage2

#region ---成员区域
                #region ---成员区域
                residenceMemberView = new FrameLayout()
                {
                    X = residenceManageView.Right,
@@ -406,37 +440,42 @@
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                };
                residenceMemberView.AddChidren(btnResidenceMemberText);
#endregion
#region ---安放区域
                residenceArmView = new FrameLayout()
                #endregion
                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    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 ---数据备份区域
                    #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",
                        SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.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 +503,120 @@
                //    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()
                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    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 = residenceMemberView.Right,
                        X = Application.GetRealWidth(28 - 24),
                        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
                }
            }
            else
            {
#region ---安放区域
                residenceArmView = new FrameLayout()
                residenceInfoView.AddChidren(new Button()
                {
                    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,
                    Y = Application.GetRealHeight(20 + 42),
                    Height = Application.GetRealHeight(40),
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                };
                residenceArmView.AddChidren(btnResidenceArmText);
#endregion
#region ---数据备份区域
                    TextID = StringId.FunctionNotOpen,
                });

                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    #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",
                        SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.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 F3阶段
                #region ---数据备份区域
                //residenceDataBackupView = new FrameLayout()
                //{
                //    X = residenceArmView.Right,
@@ -587,137 +644,138 @@
                //    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 智能音箱、获取支持、关于ON+ 等菜单列表
            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()
            supportView = new VerticalScrolViewLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(343),
@@ -726,18 +784,87 @@
                Radius = (uint)Application.GetRealHeight(12),
                BorderColor = 0x00FFFFFF,
                BorderWidth = 0,
                ScrollEnabled = false,
                VerticalScrollBarEnabled = false,//隐藏滚动条
            };
            contentView.AddChidren(supportView);



            #region 智能音箱
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                //supportView 加高 显示3行 3*44
                supportView.Height = Application.GetRealWidth(3*44);

                FrameLayout smartSpeakerView = new FrameLayout()
                {
                    Height = Application.GetRealWidth(44),
                };
                supportView.AddChidren(smartSpeakerView);

                //住宅为当前账号才显示智能音箱入口
                Button btnSmartSpeakerIcon = new Button()
                {
                    X = Application.GetRealWidth(12),
                    Y = Application.GetRealWidth(10),
                    Width = Application.GetMinRealAverage(24),
                    Height = Application.GetMinRealAverage(24),
                    UnSelectedImagePath = "PersonalCenter/SmartSpeaker.png",
                };
                smartSpeakerView.AddChidren(btnSmartSpeakerIcon);

                btnSmartSpeakerText = new Button()
                {
                    X = Application.GetRealWidth(48),
                    Width = Application.GetRealWidth(270),
                    Height = Application.GetRealWidth(44),
                    TextID = StringId.SmartSpeaker,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = CSS_FontSize.TextFontSize
                };
                smartSpeakerView.AddChidren(btnSmartSpeakerText);

                Button btnSmartSpeakerRight = new Button()
                {
                    X = Application.GetRealWidth(315),
                    Y = Application.GetRealWidth(14),
                    Width = Application.GetMinRealAverage(16),
                    Height = Application.GetMinRealAverage(16),
                    UnSelectedImagePath = "Public/Right.png",
                };
                smartSpeakerView.AddChidren(btnSmartSpeakerRight);

                var btnSmartSpeakerViewLine = new Button()
                {
                    X = Application.GetRealWidth(48),
                    Y = Application.GetRealWidth(43),
                    Height = Application.GetRealHeight(1),
                    Width = Application.GetRealWidth(279),
                    BackgroundColor = CSS_Color.DividingLineColor
                };
                smartSpeakerView.AddChidren(btnSmartSpeakerViewLine);
            }

            #endregion

            #region 获取支持
            FrameLayout supView = new FrameLayout()
            {
                Height = Application.GetRealWidth(44),
            };
            supportView.AddChidren(supView);

            Button btnSupportIcon = new Button()
            {
                X = Application.GetRealWidth(12),
                Y = Application.GetRealHeight(10),
                Y = Application.GetRealWidth(10),
                Width = Application.GetMinRealAverage(24),
                Height = Application.GetMinRealAverage(24),
                UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
            };
            supportView.AddChidren(btnSupportIcon);
            supView.AddChidren(btnSupportIcon);

            btnSupportText = new Button()
            {
@@ -749,7 +876,8 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.TextFontSize
            };
            supportView.AddChidren(btnSupportText);
            supView.AddChidren(btnSupportText);

            Button btnSupportRight = new Button()
            {
                X = Application.GetRealWidth(315),
@@ -758,33 +886,39 @@
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            supportView.AddChidren(btnSupportRight);


            supView.AddChidren(btnSupportRight);

            var btnSupportViewLine = new Button()
            {
                X = Application.GetRealWidth(48),
                Y = btnSupportText.Bottom,
                Y = Application.GetRealWidth(43),
                Height = Application.GetRealHeight(1),
                Width = Application.GetRealWidth(279),
                BackgroundColor = CSS_Color.DividingLineColor
            };
            supportView.AddChidren(btnSupportViewLine);
            supView.AddChidren(btnSupportViewLine);
            #endregion

            #region 关于ON+
            FrameLayout aboutView = new FrameLayout()
            {
                Height = Application.GetRealWidth(44),
            };
            supportView.AddChidren(aboutView);

            Button btnAboutOnIcon = new Button()
            {
                X = Application.GetRealWidth(12),
                Y = Application.GetRealWidth(54),
                Y = Application.GetRealWidth(10),
                Width = Application.GetMinRealAverage(24),
                Height = Application.GetMinRealAverage(24),
                UnSelectedImagePath = "PersonalCenter/InfoOnIcon.png",
            };
            supportView.AddChidren(btnAboutOnIcon);
            aboutView.AddChidren(btnAboutOnIcon);

            btnAboutOnText = new Button()
            {
                X = Application.GetRealWidth(48),
                Y = btnSupportViewLine.Bottom,
                Width = Application.GetRealWidth(370),
                Height = Application.GetRealWidth(44),
                TextID = StringId.AboutOn,
@@ -792,24 +926,24 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.TextFontSize
            };
            supportView.AddChidren(btnAboutOnText);
            aboutView.AddChidren(btnAboutOnText);

            Button btnAboutOnRight = new Button()
            {
                X = Application.GetRealWidth(315),
                Y = Application.GetRealWidth(58),
                Y = Application.GetRealWidth(14),
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            supportView.AddChidren(btnAboutOnRight);
            aboutView.AddChidren(btnAboutOnRight);
            #endregion


#endregion
            #endregion

            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(28) });

            LoadEventList();
        }
    }
}
}