金辉项目，萤石摄像头更新

wei

2021-04-01 e3f3f62315a5789cd812b96954b67bffda4a0f5a

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

@@ -474,6 +474,11 @@
                        #endregion
                        break;
                    case ShowFunction.EnergyMonitoring:
                        #region 能源
                        functionCount = FunctionList.List.GetElectricals().Count;
                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        #endregion
                        //functionCount = 1;
                        break;
                    case ShowFunction.Environmental:
                        #region 环境数据
@@ -496,6 +501,10 @@
                        functionCount = FunctionList.List.GetArmSensorList().Count;
                        break;
                    case ShowFunction.VideoIntercom:
                        if (FunctionList.List.videoIntercom != null)
                        {
                            functionCount = 1;
                        }
                        break;

                }
@@ -554,6 +563,7 @@

                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir
                    && item != ShowFunction.EnergyMonitoring
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
@@ -723,7 +733,15 @@
                        #endregion
                        break;
                    case ShowFunction.EnergyMonitoring:
                        #region 能源监测
                        btnName.TextID = StringId.EnergyMonitoring;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
                            var skipView = new EnergyMainPage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        #endregion
                        break;
                    case ShowFunction.Environmental:
                        #region 环境数据
@@ -739,6 +757,27 @@
                        break;
                    case ShowFunction.FreshAir:
                        btnName.TextID = StringId.FreshAir;
                        #region Light
                        Button btnFreshAirPower = new Button()
                        {
                            X = Application.GetRealWidth(120),
                            Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
                            Width = Application.GetRealWidth(32),
                            Height = Application.GetRealWidth(32),
                            SelectedImagePath = "Public/PowerOpen.png",
                            UnSelectedImagePath = "Public/PowerClose.png",
                            IsSelected = functionOnCount > 0,
                            Tag = item + "_AllControl",
                        };
                        functionView.AddChidren(btnFreshAirPower);

                        btnFreshAirPower.MouseUpEventHandler = (sender, e) =>
                        {
                            LoadEvent_SwitchFunction(btnFreshAirPower, item, functionView);
                        };
                        functionPageTitleId = StringId.FreshAir;

                        #endregion
                        break;
                    case ShowFunction.Music:
                        btnName.TextID = StringId.Music;
@@ -766,11 +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)
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
                    && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {