2020-06-016

wxr

2020-06-16 f6fd8acd7c53c44187e70b4709443318a628f4b5

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

@@ -92,18 +92,18 @@
        /// 区域安放小区域文本
        /// </summary>
        Button btnResidenceArmText;
        /// <summary>
        /// 区域数据备份小区域
        /// </summary>
        FrameLayout residenceDataBackupView;
        /// <summary>
        /// 区域数据备份小区域图标
        /// </summary>
        Button btnResidenceDataBackupIcon;
        /// <summary>
        /// 区域数据备份小区域文本
        /// </summary>
        Button btnResidenceDataBackupText;
        ///// <summary>
        ///// 区域数据备份小区域
        ///// </summary>
        //FrameLayout residenceDataBackupView;
        ///// <summary>
        ///// 区域数据备份小区域图标
        ///// </summary>
        //Button btnResidenceDataBackupIcon;
        ///// <summary>
        ///// 区域数据备份小区域文本
        ///// </summary>
        //Button btnResidenceDataBackupText;
        /// <summary>
        /// 区域辅助功能小区域
        /// </summary>
@@ -245,7 +245,7 @@
            #endregion

            #region 住宅信息区域
            if (MainPage.LoginUser.accountType == 0)
            if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            {
                residenceInfoView = new FrameLayout()
                {
@@ -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.residenceData.residecenInfo.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 ? "管理员" : "成员"
                Text = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
                        == false ? "管理员" : "成员"
            };
            userTypeView.AddChidren(btnUserTypeName);
            #endregion
            #region 住宅管理
            if (MainPage.LoginUser.accountType == 0)
            if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
            {
                #region ---住宅管理区域
                residenceManageView = new FrameLayout()
@@ -426,39 +428,40 @@
                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,
                    X = Application.GetRealWidth(28 - 24),
                    //X = residenceDataBackupView.Right,
                    Y = residenceManageView.Bottom,
                    Width = Application.GetRealWidth(64 + 48),
                    Height = Application.GetRealWidth(64),
@@ -547,39 +550,39 @@
                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,
                    X = residenceArmView.Right,
                    Y = Application.GetRealHeight(68),
                    Width = Application.GetRealWidth(64 + 48),
                    Height = Application.GetRealWidth(64),