Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -83,6 +83,7 @@

            //不是A网关或者是成员 只允许添加场景隐藏自动化
            var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
            bool hideSecurity = true;
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {
@@ -159,7 +160,6 @@
                    var otherWidth = (Application.GetRealWidth(375) - btnAutomationTitle.Width) / 2;
                    btnAutomationTitle.X = otherWidth;


                    btnSceneTilte = new Button()
                    {
                        Y = Application.GetRealHeight(40),
@@ -174,7 +174,6 @@
                    };
                    topView.AddChidren(btnSceneTilte);


                    btnSecurityTitle = new Button()
                    {
                        X = btnAutomationTitle.Right,
@@ -188,6 +187,7 @@
                        TextID = StringId.anfang,
                    };
                    topView.AddChidren(btnSecurityTitle);
                    hideSecurity = false;
                }
                else
                {
@@ -253,7 +253,10 @@
            {
                LoadAutomationPageView();
            }
            LoadSecurityPageView();
            if (!hideSecurity)
            {
                LoadSecurityPageView();
            }
            LoadEventList();

        }