全视通IOS更新

wxr

2023-03-21 2704f6cb96e9460713c6730736e31af26c76dd53

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

@@ -294,21 +294,21 @@
            var residenceFunctionCount = 0;

            #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()
                {
@@ -586,45 +586,46 @@

                    residenceFunctionCount++;
                    #region ---组合调光
                    var faceManagementView = new FrameLayout()
                    {
                        X = Application.GetRealWidth(28 - 24),
                        Y = residenceManageView.Bottom,
                        Width = Application.GetRealWidth(64 + 48),
                        Height = Application.GetRealWidth(64),
                    };
                    residenceInfoView.AddChidren(faceManagementView);
                    //var faceManagementView = new FrameLayout()
                    //{
                    //    X = Application.GetRealWidth(28 - 24),
                    //    Y = residenceManageView.Bottom,
                    //    Width = Application.GetRealWidth(64 + 48),
                    //    Height = Application.GetRealWidth(64),
                    //};
                    //residenceInfoView.AddChidren(faceManagementView);

                    var btnFaceManagementIcon = new Button
                    {
                        Gravity = Gravity.CenterHorizontal,
                        Y = Application.GetRealHeight(5),
                        Width = Application.GetMinRealAverage(30),
                        Height = Application.GetMinRealAverage(30),
                        UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png",
                    };
                    faceManagementView.AddChidren(btnFaceManagementIcon);
                    var btnFaceManagementText = new Button()
                    {
                        Y = btnResidenceManageIcon.Bottom,
                        Height = Application.GetRealHeight(29),
                        TextID = StringId.CombinedDimming,
                        TextAlignment = TextAlignment.Center,
                        TextColor = CSS_Color.FirstLevelTitleColor,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                    };
                    faceManagementView.AddChidren(btnFaceManagementText);
                    //var btnFaceManagementIcon = new Button
                    //{
                    //    Gravity = Gravity.CenterHorizontal,
                    //    Y = Application.GetRealHeight(5),
                    //    Width = Application.GetMinRealAverage(30),
                    //    Height = Application.GetMinRealAverage(30),
                    //    UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png",
                    //};
                    //faceManagementView.AddChidren(btnFaceManagementIcon);
                    //var btnFaceManagementText = new Button()
                    //{
                    //    Y = btnResidenceManageIcon.Bottom,
                    //    Height = Application.GetRealHeight(29),
                    //    TextID = StringId.CombinedDimming,
                    //    TextAlignment = TextAlignment.Center,
                    //    TextColor = CSS_Color.FirstLevelTitleColor,
                    //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
                    //};
                    //faceManagementView.AddChidren(btnFaceManagementText);

                    //EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
                    //    var page = new CombinedDimmingListPage();
                    //    MainPage.BasePageView.AddChidren(page);
                    //    page.LoadPage();
                    //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    //};
                    //faceManagementView.MouseUpEventHandler = eventHandler;
                    //btnFaceManagementText.MouseUpEventHandler = eventHandler;
                    //btnFaceManagementIcon.MouseUpEventHandler = eventHandler;
                    #endregion

                    EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
                        var page = new CombinedDimmingListPage();
                        MainPage.BasePageView.AddChidren(page);
                        page.LoadPage();
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    };
                    faceManagementView.MouseUpEventHandler = eventHandler;
                    btnFaceManagementText.MouseUpEventHandler = eventHandler;
                    btnFaceManagementIcon.MouseUpEventHandler = eventHandler;
                }
            }
            else