blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wei
2021-07-09 068c68295cad1967f7aafb4e5e951260ef03d4ce 
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs


@@ -654,25 +654,25 @@


                    case ShowFunction.Light:


                        #region Light


                        functionCount = FunctionList.List.GetLightList().Count;


                        functionOnCount = FunctionList.List.GetLightList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;


                        functionOnCount = FunctionList.List.GetLightList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count;


                        #endregion


                        break;


                    case ShowFunction.AC:


                        #region AC


                        functionCount = FunctionList.List.GetAcList().Count;


                        functionOnCount = FunctionList.List.GetAcList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;


                        functionOnCount = FunctionList.List.GetAcList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count;


                        #endregion


                        break;


                    case ShowFunction.Curtain:


                        #region Curtain


                        functionCount = FunctionList.List.GetCurtainList().Count;


                        functionOnCount = FunctionList.List.GetCurtainList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;


                        functionOnCount = FunctionList.List.GetCurtainList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count;


                        #endregion


                        break;


                    case ShowFunction.FloorHeating:


                        #region 地热


                        functionCount = FunctionList.List.GetFloorHeatingList().Count;


                        functionOnCount = FunctionList.List.GetFloorHeatingList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;


                        functionOnCount = FunctionList.List.GetFloorHeatingList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count;


                        #endregion


                        break;


                    case ShowFunction.DoorLock:


@@ -680,13 +680,13 @@


                    case ShowFunction.Electric:


                        #region 电器


                        functionCount = FunctionList.List.GetElectricals().Count;


                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;


                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count;


                        #endregion


                        break;


                    case ShowFunction.EnergyMonitoring:


                        #region 能源


                        functionCount = FunctionList.List.GetEnergyList().Count;


                        functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;


                        functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count;


                        #endregion


                        break;


                    case ShowFunction.Environmental:


@@ -696,7 +696,7 @@


                        break;


                    case ShowFunction.FreshAir:


                        functionCount = FunctionList.List.GetAirFreshList().Count;


                        functionOnCount = FunctionList.List.GetAirFreshList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;


                        functionOnCount = FunctionList.List.GetAirFreshList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count;


                        break;


                    case ShowFunction.Music:


                        //functionCount = Music.A31MusicModel.A31MusicModelList.Count;


@@ -719,7 +719,7 @@


                        functionCount = FunctionList.List.GetArmSensorList().Count;


                        break;


                    case ShowFunction.VideoIntercom:


                        if (FunctionList.List.videoIntercom != null)


                        if (FunctionList.List.videoIntercom != null && FunctionList.List.videoIntercom.Count > 0)


                        {


                            functionCount = 1;


                        }


@@ -1028,12 +1028,12 @@


                        btnName.TextID = StringId.Sensor;


                        functionPageTitleId = StringId.Sensor;


                        break;


                    case ShowFunction.VideoIntercom:


                    case ShowFunction.VideoIntercom://可视对讲


                        btnName.TextID = StringId.VideoIntercom;


                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>


                        {


                            var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();


                            videoMethod.MianView(this,FunctionList.List.videoIntercom);


                            videoMethod.MianView(this);


                        };


                        break;


                    case ShowFunction.SecurityCenter: