Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -647,7 +647,6 @@

            var functionCategoryCount = 0;

            //Tag 分类卡片显示
            foreach (var item in DB_ResidenceData.Instance.functionTypeList)
            {
                int functionCount = 0;
@@ -710,7 +709,6 @@
#endif
                        break;
                    case ShowFunction.Panel:
                        functionCount = FunctionList.List.GetPanelList().Count;
                        break;
                    case ShowFunction.SecurityMonitoring:
                        if (!MainPage.NoLoginMode)
@@ -790,28 +788,10 @@
                };
                functionView.AddChidren(btnName);

                //Tag 数量显示
                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
                    && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
                    && functionCount != 0)
                {
                    if (item == ShowFunction.Panel)
                    {
                        Button btnFunctionCount = new Button()
                        {
                            X = Application.GetRealWidth(16),
                            Y = btnName.Bottom,
                            Width = Application.GetRealWidth(120),
                            Height = Application.GetRealHeight(24),
                            TextColor = CSS_Color.PromptingColor1,
                            TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                            TextAlignment = TextAlignment.CenterLeft,
                            Text = functionCount.ToString(),
                        };
                        functionView.AddChidren(btnFunctionCount);
                    }
                    else
                    {
                        Button btnFunctionCount = new Button()
                        {
@@ -840,7 +820,6 @@
                        };
                        functionView.AddChidren(btnOpenCount);
                    }
                }


                Button btnFunctionViewBg;
@@ -851,7 +830,6 @@
                };
                functionView.AddChidren(btnFunctionViewBg);

                //Tag 调试事件判断
                int functionPageTitleId = 0;
                switch (item)
                {
@@ -1044,8 +1022,7 @@
                        };
                        break;
                    case ShowFunction.Panel:
                        btnName.TextID = StringId.SmartPanel;
                        functionPageTitleId = StringId.SmartPanel;
                        btnName.TextID = StringId.Panel;
                        break;
                    case ShowFunction.SecurityMonitoring:
                        btnName.TextID = StringId.SecurityMonitoring;