合并可视对讲代码

wei

2021-03-31 19e762179bdc9efc23704bc471cf974ed282b43d

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

@@ -501,6 +501,10 @@
                        functionCount = FunctionList.List.GetArmSensorList().Count;
                        break;
                    case ShowFunction.VideoIntercom:
                        if (FunctionList.List.videoIntercom != null)
                        {
                            functionCount = 1;
                        }
                        break;

                }
@@ -801,12 +805,20 @@
                        break;
                    case ShowFunction.VideoIntercom:
                        btnName.TextID = StringId.VideoIntercom;

                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var mainView = new HDL_ON.UI.UI2.FuntionControlView.Video.MainView();
                            MainPage.BasePageView.AddChidren(mainView);
                            mainView.Show();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        break;

                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
                    && ShowFunction.EnergyMonitoring!= item)
                    && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {