Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

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

@@ -86,7 +86,7 @@
            //判断是否需要隐藏自动化
            if (HideAutoPage)
            {
                if (false && DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入改界面
                if (DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入该界面
                {
                    btnSceneTilte  = new Button()
                    {
@@ -139,7 +139,7 @@
            }
            else
            {
                if (false && DB_ResidenceData.Instance.GatewayType == 1)//网关需要加载安防--2021-11-28 19:56:53  刘晓辉将安防放入改界面
                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    btnAutomationTitle = new Button()
                    {
@@ -695,7 +695,7 @@
                    btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
                    btnSceneTilte.IsSelected = false;
                    btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
                    contentPageView.PageIndex = 2;
                    contentPageView.PageIndex = contentPageView.ChildrenCount - 1;
                };
            }
        }