From 300a5d5370d10d97eb5dfdfa43bb0156c15d23e3 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 03 一月 2024 17:36:15 +0800 Subject: [PATCH] packet类复原 --- HDL_ON/Entity/Function/Sensor.cs | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs index b53b38a..8a06e8b 100644 --- a/HDL_ON/Entity/Function/Sensor.cs +++ b/HDL_ON/Entity/Function/Sensor.cs @@ -61,6 +61,10 @@ case SPK.SensorHumidity: attr = function.GetAttribute(FunctionAttributeKey.Humidity); break; + case SPK.SensorPm10: + attr = function.GetAttribute(FunctionAttributeKey.Pm10); + break; + } } double value = 0.0; @@ -90,14 +94,20 @@ /// </summary> public List<string> GetIntervalValue(string spk) { - if(_intervalValue.Count != 0) - { - return _intervalValue; - } + //if (_intervalValue.Count != 0) + //{ + // return _intervalValue; + //} _intervalValue = new List<string>(); switch (spk) { case SPK.SensorPm25: + _intervalValue.Add("0 ~ 50"); + _intervalValue.Add("51 ~ 100"); + _intervalValue.Add("101 ~ 150"); + _intervalValue.Add("151 ~"); + break; + case SPK.SensorPm10: _intervalValue.Add("0 ~ 35"); _intervalValue.Add("36 ~ 75"); _intervalValue.Add("76 ~ 115"); @@ -159,7 +169,7 @@ switch (function.spk) { case SPK.SensorPm25: - unit = "ug/m虏"; + unit = "ug/m鲁"; break; case SPK.SensorTemperature: unit = "掳C"; @@ -211,6 +221,7 @@ _levelColorList.Add(0xFFFF3D3D); break; case SPK.SensorTVOC: + case SPK.SensorPm10: _levelColorList.Add(0xFFADE764); _levelColorList.Add(0xFFFFD154); _levelColorList.Add(0xFFFF9D54); @@ -246,6 +257,7 @@ switch (spk) { case SPK.SensorPm25: + case SPK.SensorPm10: _levelTextList.Add(StringId.Great); _levelTextList.Add(StringId.Good); _levelTextList.Add(StringId.MildPollution); -- Gitblit v1.8.0