2021-07-06 1.更新

JLChen

2021-07-06 d72ca686a3e262693f8a6e45e747e8e8da43335b

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

old mode 100755
new mode 100644
@@ -109,18 +109,18 @@
        ///// 区域辅助功能小区域文本
        ///// </summary>
        //Button btnResidenceAuxiliaryFunctionText;
        ///// <summary>
        ///// 区域添加功能小区域
        ///// </summary>
        //FrameLayout residenceAddFunctionView;
        ///// <summary>
        ///// 区域添加功能小区域图标
        ///// </summary>
        //Button btnResidenceAddFunctionIcon;
        ///// <summary>
        ///// 区域添加功能小区域文本
        ///// </summary>
        //Button btnResidenceAddFunctionText;
        /// <summary>
        /// 区域添加功能小区域
        /// </summary>
        FrameLayout residenceAddFunctionView;
        /// <summary>
        /// 区域添加功能小区域图标
        /// </summary>
        Button btnResidenceAddFunctionIcon;
        /// <summary>
        /// 区域添加功能小区域文本
        /// </summary>
        Button btnResidenceAddFunctionText;
        #endregion

        #region F3阶段
@@ -192,12 +192,12 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
                Text = UserInfo.Current.userName// string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
            };
            personalInfoView.AddChidren(btnUserName);
            if (!string.IsNullOrEmpty( UserInfo.Current.userName))
            if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
            {
                btnUserName.Text =  UserInfo.Current.userName; ;
                btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
            }
            btnEmail = new Button()
            {
@@ -244,7 +244,6 @@
        {
            contentView.RemoveAll();

            #region F3阶段
            #region 住宅信息区域
            //if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            //{
@@ -261,7 +260,6 @@
            //    contentView.AddChidren(residenceInfoView);
            //}
            //else
            #endregion
            {
                residenceInfoView = new FrameLayout()
                {
@@ -297,6 +295,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                Text = DB_ResidenceData.Instance.CurrentRegion.Name,
                IsBold = true
            };
            residenceInfoView.AddChidren(btnCurResidenceName);

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

            btnUserTypeIcon = new Button()
            {
@@ -320,11 +325,10 @@
                                    == 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,
@@ -335,6 +339,7 @@
            userTypeView.AddChidren(btnUserTypeName);
            #endregion
            #region 住宅管理

            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                #region ---住宅管理区域
@@ -491,38 +496,49 @@
                #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 = residenceMemberView.Right,
                    //X = Application.GetRealWidth(28 - 24),
                    Y = Application.GetRealHeight(68),
                    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
            {
                residenceInfoView.AddChidren(new Button()
                {
                    Y = Application.GetRealHeight(20 + 42),
                    Height = Application.GetRealHeight(40),
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextID = StringId.FunctionNotOpen,
                });

                #region F3阶段
                #region ---安放区域
                //residenceArmView = new FrameLayout()