wxr
2021-12-08 b4f5f74d74a0a0996358d8348956601b30f17266
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -86,7 +86,7 @@
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {
                if (DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入改界面
                if (false && DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入改界面
                {
                    btnSceneTilte  = new Button()
                    {
@@ -112,7 +112,7 @@
                        TextSize = CSS_FontSize.TextFontSize,
                        TextColor = CSS_Color.PromptingColor1,
                        SelectedTextColor = CSS_Color.MainColor,
                        TextID = StringId.SecurityCenter,
                        TextID = StringId.anfang,
                    };
                    topView.AddChidren(btnSecurityTitle);
                    btnAutomationTitle = new Button();
@@ -134,15 +134,14 @@
                    };
                    topView.AddChidren(btnSceneTilte);
                    btnAutomationTitle = new Button();
                    btnAutomationTitle = new Button();
                }
            }
            else
            {
                if (DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入改界面
                if (false && DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入改界面
                {
                    btnAutomationTitle   = new Button()
                    btnAutomationTitle = new Button()
                    {
                        Y = Application.GetRealHeight(30),
                        Gravity = Gravity.CenterHorizontal,
@@ -186,7 +185,7 @@
                        TextSize = CSS_FontSize.TextFontSize,
                        TextColor = CSS_Color.PromptingColor1,
                        SelectedTextColor = CSS_Color.MainColor,
                        TextID = StringId.SecurityCenter,
                        TextID = StringId.anfang,
                    };
                    topView.AddChidren(btnSecurityTitle);
                }
@@ -219,7 +218,6 @@
                        TextID = StringId.Automation,
                    };
                    topView.AddChidren(btnAutomationTitle);
                    btnAutomationTitle = new Button();
                }
            }
            btnAddIconBg = new Button()
@@ -616,9 +614,12 @@
                else if (contentPageView.PageIndex == 0)
                {
                    btnAddIconBg.Visible = true;
                    btnSecurityTitle.IsSelected = false;
                    btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                    btnSecurityTitle.IsBold = false;
                    if (btnSecurityTitle != null)
                    {
                        btnSecurityTitle.IsSelected = false;
                        btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                        btnSecurityTitle.IsBold = false;
                    }
                    btnSceneTilte.IsSelected = true;
                    btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
                    btnSceneTilte.IsBold = true;
@@ -629,9 +630,12 @@
                else
                {
                    btnAddIconBg.Visible = true;
                    btnSecurityTitle.IsSelected = false;
                    btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                    btnSecurityTitle.IsBold = false;
                    if (btnSecurityTitle != null)
                    {
                        btnSecurityTitle.IsSelected = false;
                        btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                        btnSecurityTitle.IsBold = false;
                    }
                    btnAutomationTitle.IsSelected = true;
                    btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
                    btnAutomationTitle.IsBold = true;
@@ -647,8 +651,12 @@
                {
                    return;
                }
                btnSecurityTitle.IsSelected = false;
                btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                if (btnSecurityTitle != null)
                {
                    btnSecurityTitle.IsSelected = false;
                    btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                }
                btnSceneTilte.IsSelected = true;
                btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
                btnAutomationTitle.IsSelected = false;
@@ -661,8 +669,12 @@
                {
                    return;
                }
                btnSecurityTitle.IsSelected = false;
                btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                if (btnSecurityTitle != null)
                {
                    btnSecurityTitle.IsSelected = false;
                    btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
                }
                btnAutomationTitle.IsSelected = true;
                btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
                btnSceneTilte.IsSelected = false;