From c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 02 三月 2021 17:48:32 +0800 Subject: [PATCH] Merge branch 'master' into wjc --- Crabtree/SmartHome/HDL/Common/CommonUtlis.cs | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 1 deletions(-) diff --git a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs index b023a58..827f722 100644 --- a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs +++ b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs @@ -531,7 +531,7 @@ } } - + #endregion //#region 鈻� 鏂囦欢鎿嶄綔_______________________ @@ -552,5 +552,121 @@ //#endregion + #region 璁惧鍒楄〃杩囨护 + /// <summary> + /// 鎵惧嚭闇�瑕佹樉绀虹殑璁惧锛屽姞杞藉綋鍓岮PP鏀寔鐨勬墍鏈夎澶囩被鍨� + /// </summary> + /// <returns></returns> + public List<string> GetAllLocalEquipments () { + //鎵惧嚭闇�瑕佹樉绀虹殑璁惧 + var filesList = IO.FileUtils.ReadFiles ().FindAll ((obj) => { + string [] str = obj.Split ('_'); + return obj.StartsWith ("Equipment_") && str.Length == 5; + }); + var localEquipments = filesList.FindAll ((obj) => { + string typeString = obj.Split ('_') [1]; + return ( + #region light + typeString.ToString () == DeviceType.LightCCT.ToString () || + typeString.ToString () == DeviceType.LightRGB.ToString () || + typeString.ToString () == DeviceType.LightDALI.ToString () || + typeString.ToString () == DeviceType.LightRGBW.ToString () || + typeString.ToString () == DeviceType.LightLogic.ToString () || + typeString.ToString () == DeviceType.LightSwitch.ToString () || + typeString.ToString () == DeviceType.LightDimming.ToString () || + typeString.ToString () == DeviceType.LightMixSwitch.ToString () || + typeString.ToString () == DeviceType.LightRGBandCCT.ToString () || + typeString.ToString () == DeviceType.LightMixDimming.ToString () || + typeString.ToString () == DeviceType.LightEnergySwitch.ToString () || + typeString.ToString () == DeviceType.LightEnergySocket.ToString () || + typeString.ToString () == DeviceType.LightSwitchSocket.ToString () + || typeString.ToString () == DeviceType.DMX48.ToString () + #endregion + #region light + || typeString.ToString () == DeviceType.SensorCH4.ToString () || + typeString.ToString () == DeviceType.SensorCO2.ToString () || + typeString.ToString () == DeviceType.SensorLPG.ToString () || + typeString.ToString () == DeviceType.SensorCOH2.ToString () || + typeString.ToString () == DeviceType.SensorPM25.ToString () || + typeString.ToString () == DeviceType.SensorTVOC.ToString () || + typeString.ToString () == DeviceType.SensorPower.ToString () || + typeString.ToString () == DeviceType.SensorSmoke.ToString () || + typeString.ToString () == DeviceType.SensorWater.ToString () || + typeString.ToString () == DeviceType.SensorWeight.ToString () || + typeString.ToString () == DeviceType.SensorCurrent.ToString () || + typeString.ToString () == DeviceType.SensorVoltage.ToString () + || typeString.ToString () == DeviceType.SensorRainfall.ToString () + || typeString.ToString () == DeviceType.SensorVelocity.ToString () + || typeString.ToString () == DeviceType.SensorMenciAndwindowMagnetic.ToString () + || typeString.ToString () == DeviceType.SensorMobileDetection.ToString () + || typeString.ToString () == DeviceType.SensorLiquidPressure.ToString () + || typeString.ToString () == DeviceType.SensorVibration.ToString () + || typeString.ToString () == DeviceType.SensorLiquidFlow.ToString () + || typeString.ToString () == DeviceType.SensorLiquidDepth.ToString () + || typeString.ToString () == DeviceType.SensorTemperature.ToString () + || typeString.ToString () == DeviceType.SensorHeightLength.ToString () + || typeString.ToString () == DeviceType.SensorIllumination.ToString () + || typeString.ToString () == DeviceType.SensorWindPressure.ToString () + || typeString.ToString () == DeviceType.SensorHumidity.ToString () + #endregion + #region curtain + || typeString.ToString () == DeviceType.CurtainModel.ToString () + || typeString.ToString () == DeviceType.CurtainRoller.ToString () + || typeString.ToString () == DeviceType.CurtainTrietex.ToString () + #endregion + #region ac + || typeString.ToString () == DeviceType.ACPanel.ToString () + || typeString.ToString () == DeviceType.ACDevice.ToString () + || typeString.ToString () == DeviceType.ACInfrared.ToString () + || typeString.ToString () == DeviceType.ACCoolmaster.ToString () + || typeString.ToString () == DeviceType.CustomAC.ToString () + || typeString.ToString () == DeviceType.HVAC.ToString () + #endregion + #region foolheat + || typeString.ToString () == DeviceType.FoolHeat.ToString () + || typeString.ToString () == DeviceType.FoolHeatPanel.ToString () + #endregion + #region + || typeString.ToString () == DeviceType.InfraredMode.ToString () + || typeString.ToString () == DeviceType.DoorLock.ToString () + || typeString.ToString () == DeviceType.FanModule.ToString () + || typeString.ToString () == DeviceType.FreshAir.ToString () + || typeString.ToString () == DeviceType.InfraredTV.ToString () + || typeString.ToString () == DeviceType.UniversalDevice.ToString () + || typeString.ToString () == DeviceType.MusicModel.ToString () + || typeString.ToString () == DeviceType.SecurityModule.ToString () + || typeString.ToString () == DeviceType.LogicModule.ToString () + || typeString.ToString () == DeviceType.SecurityPanel.ToString () + #endregion + ); + }); + + return localEquipments; + } + + + #endregion + + /// <summary> + /// 鏈湴Common鍖归厤浜戠鐨凢unctionList 杩斿洖Function + /// 鍖归厤瀛愮綉鍙枫�佽澶囧彿銆佸洖璺彿銆佸ぇ绫诲皬绫� + /// </summary> + /// <param name="common">鏈湴璁惧</param> + /// <returns></returns> + public Function CommonToFunction (Common common, List<Function> FunctionList) + { + if (FunctionList == null) return null; + + foreach (var function in FunctionList) { + if (common.SubnetID == function.bus.SubnetID && + common.DeviceID == function.bus.DeviceID && + common.LoopID == function.bus.LoopId && + common.DeviceTypeString == function.DeviceTypeString + ) { + return function; + } + } + return null; + } } } -- Gitblit v1.8.0