wxr
2021-12-08 b4f5f74d74a0a0996358d8348956601b30f17266
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -85,10 +85,10 @@
        /// 区域成员小区域文本
        /// </summary>
        Button btnResidenceMemberText;
        /// <summary>
        /// 区域安放小区域
        /// </summary>
        FrameLayout residenceArmView;
        ///// <summary>
        ///// 区域安放小区域
        ///// </summary>
        //FrameLayout residenceArmView;
        /// <summary>
        /// 区域成安放小区域图标
        /// </summary>
@@ -287,21 +287,21 @@
            contentView.RemoveAll();
            #region 住宅信息区域
            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
            //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()
                {
@@ -449,34 +449,34 @@
                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    #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);
                    //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
                }
@@ -546,9 +546,9 @@
                    #region ---添加功能区域
                    residenceAddFunctionView = new FrameLayout()
                    {
                        //X = residenceMemberView.Right,
                        X = Application.GetRealWidth(28 - 24),
                        Y = residenceManageView.Bottom,
                        X = residenceMemberView.Right,
                        //X = Application.GetRealWidth(28 - 24),
                        Y = Application.GetRealHeight(68),//residenceManageView.Bottom,
                        Width = Application.GetRealWidth(64 + 48),
                        Height = Application.GetRealWidth(64),
                    };
@@ -590,34 +590,34 @@
                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);
                    //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阶段