Merge branch 'dev-cqy（1.5.9）' into wjc

wjc

2023-03-29 adf7df175e590b7d9e0f33c0c2ea1d2897da6301

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

@@ -86,38 +86,38 @@
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {
                if (DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入该界面
                {
                    btnSceneTilte  = new Button()
                    {
                        Y = Application.GetRealHeight(30),
                        Width = Application.GetRealWidth(170),
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.CenterRight,
                        TextSize = CSS_FontSize.HeadlineFontSize,
                        TextColor = CSS_Color.PromptingColor1,
                        SelectedTextColor = CSS_Color.MainColor,
                        TextID = StringId.Scenes,
                        IsSelected = true
                    };
                    topView.AddChidren(btnSceneTilte);
                //if (DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入该界面
                //{
                //    btnSceneTilte  = new Button()
                //    {
                //        Y = Application.GetRealHeight(30),
                //        Width = Application.GetRealWidth(170),
                //        Height = Application.GetRealHeight(25),
                //        TextAlignment = TextAlignment.CenterRight,
                //        TextSize = CSS_FontSize.HeadlineFontSize,
                //        TextColor = CSS_Color.PromptingColor1,
                //        SelectedTextColor = CSS_Color.MainColor,
                //        TextID = StringId.Scenes,
                //        IsSelected = true
                //    };
                //    topView.AddChidren(btnSceneTilte);

                    btnSecurityTitle = new Button()
                    {
                        X = Application.GetRealWidth(209),
                        Y = Application.GetRealHeight(30),
                        Width = Application.GetRealWidth(170),
                        Height = Application.GetRealHeight(25),
                        TextAlignment = TextAlignment.CenterLeft,
                        TextSize = CSS_FontSize.TextFontSize,
                        TextColor = CSS_Color.PromptingColor1,
                        SelectedTextColor = CSS_Color.MainColor,
                        TextID = StringId.anfang,
                    };
                    topView.AddChidren(btnSecurityTitle);
                    btnAutomationTitle = new Button();
                }
                else
                //    btnSecurityTitle = new Button()
                //    {
                //        X = Application.GetRealWidth(209),
                //        Y = Application.GetRealHeight(30),
                //        Width = Application.GetRealWidth(170),
                //        Height = Application.GetRealHeight(25),
                //        TextAlignment = TextAlignment.CenterLeft,
                //        TextSize = CSS_FontSize.TextFontSize,
                //        TextColor = CSS_Color.PromptingColor1,
                //        SelectedTextColor = CSS_Color.MainColor,
                //        TextID = StringId.anfang,
                //    };
                //    topView.AddChidren(btnSecurityTitle);
                //    btnAutomationTitle = new Button();
                //}
                //else
                {

                    btnSceneTilte = new Button()