2021-04-13

wei

2021-04-14 1498a62d1d44d715e310b42e3133aa8cdc6eec92

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

@@ -478,7 +478,7 @@
                        functionCount = FunctionList.List.GetElectricals().Count;
                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        #endregion
                        functionCount = 1;
                        //functionCount = 1;
                        break;
                    case ShowFunction.Environmental:
                        #region 环境数据
@@ -495,7 +495,7 @@
                    case ShowFunction.Panel:
                        break;
                    case ShowFunction.SecurityMonitoring:
                        //functionCount = 1;
                        functionCount = 1;
                        break;
                    case ShowFunction.Sensor:
                        functionCount = FunctionList.List.GetArmSensorList().Count;
@@ -505,6 +505,11 @@
                        {
                            functionCount = 1;
                        }
                        break;
                    case ShowFunction.SecurityCenter:
#if DEBUG
                        functionCount = 1;
#endif
                        break;

                }
@@ -563,7 +568,7 @@

                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir
                    && item != ShowFunction.EnergyMonitoring
                    && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
@@ -815,7 +820,7 @@
                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
                    && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item)
                    && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {