1

wei

2021-04-20 f80dce34c60279a4c2054a9959df81473f4e8056

 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,13 @@
                        functionCount = FunctionList.List.GetArmSensorList().Count;
                        break;
                    case ShowFunction.VideoIntercom:
                        if (FunctionList.List.videoIntercom != null)
                        {
                            functionCount = 1;
                        }
                        break;
                    case ShowFunction.SecurityCenter:
                        functionCount = FunctionList.List.securities.Count;
                        break;

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

                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir
                    && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
@@ -617,7 +630,7 @@
                            LoadEvent_SwitchFunction(btnLightPower, item, functionView);
                        };
                        functionPageTitleId = StringId.Lights;
                      

                        #endregion
                        break;
                    case ShowFunction.AC:
@@ -723,7 +736,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 环境数据
@@ -787,11 +808,17 @@
                        break;
                    case ShowFunction.VideoIntercom:
                        btnName.TextID = StringId.VideoIntercom;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
                            videoMethod.MianView(this,FunctionList.List.videoIntercom);
                        };
                        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 && ShowFunction.SecurityCenter != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {