From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 01 九月 2020 15:22:09 +0800 Subject: [PATCH] 2020-09-01 --- HDL_ON/Entity/Function/Sensor.cs | 95 +++++++---------------------------------------- 1 files changed, 14 insertions(+), 81 deletions(-) diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs index c213c49..c8b1c7b 100644 --- a/HDL_ON/Entity/Function/Sensor.cs +++ b/HDL_ON/Entity/Function/Sensor.cs @@ -17,19 +17,8 @@ int nameId = 0; switch (functionType) { - case FunctionType.PM10: - nameId = StringId.PM10; - break; case FunctionType.PM25: nameId = StringId.PM25; - break; - //case FunctionType.Noise: - // nameId = StringId.Noise; - - break; - case FunctionType.WindPower: - nameId = StringId.WindPower; - break; case FunctionType.CO2: nameId = StringId.CO2; @@ -60,35 +49,28 @@ { if (trait_values == null) { - trait_values = function.Find((obj) => obj.attri == "values"); + trait_values = function.Find((obj) => obj.name == "values"); //鎵句笉鍒板睘鎬ч渶瑕佸0鏄庝竴涓紝闃叉鎶ラ敊闂�� if (trait_values == null) { trait_values = new Trait() { - attri = "values", - value = new List<string> { "29" }, + name = "values", + value_key = new List<string> { "29" }, max = 10000, min = 0, }; - trait_values.curValues = trait_values.min; + trait_values.value = trait_values.min; } #if DEBUG - if (Convert.ToInt32(trait_values.curValues) == 0) + if (Convert.ToInt32(trait_values.value) == 0) { double level = 1; Random random = new Random(); switch (functionType) { - case FunctionType.PM10: - level = Math.Round(random.NextDouble() * 130, 0); - break; case FunctionType.PM25: level = Math.Round(random.NextDouble() * 130, 0); - break; - //case FunctionType.Noise: - // break; - case FunctionType.WindPower: break; case FunctionType.CO2: level = Math.Round(random.NextDouble() * 6000, 0); @@ -103,34 +85,35 @@ level = Math.Round(random.NextDouble() * 100, 0); break; } - trait_values.curValues = level; + trait_values.value = level; } #endif } - return Convert.ToDouble(trait_values.curValues); + return Convert.ToDouble(trait_values.value); } set { try - { + + { if (trait_values == null) { - trait_values = function.Find((obj) => obj.attri == "values"); + trait_values = function.Find((obj) => obj.name == "values"); //鎵句笉鍒板睘鎬ч渶瑕佸0鏄庝竴涓紝闃叉鎶ラ敊闂�� if (trait_values == null) { trait_values = new Trait() { - attri = "values", - value = new List<string> { "up" }, + name = "values", + value_key = new List<string> { "up" }, max = 100, min = 0, }; } - trait_values.curValues = trait_values.min; + trait_values.value = trait_values.min; } - trait_values.curValues = value; + trait_values.value = value; MainPage.Log($"values 鏁版嵁鍒锋柊{value}."); } catch @@ -154,21 +137,11 @@ _intervalValue = new List<string>(); switch (functionType) { - case FunctionType.PM10: - _intervalValue.Add("0 ~ 35"); - _intervalValue.Add("36 ~ 75"); - _intervalValue.Add("76 ~ 115"); - _intervalValue.Add("115 ~"); - break; case FunctionType.PM25: _intervalValue.Add("0 ~ 35"); _intervalValue.Add("36 ~ 75"); _intervalValue.Add("76 ~ 115"); _intervalValue.Add("115 ~"); - break; - //case FunctionType.Noise: - // break; - case FunctionType.WindPower: break; case FunctionType.CO2: _intervalValue.Add("0 ~ 1000"); @@ -217,23 +190,11 @@ _levelColorList = new List<uint>(); switch (functionType) { - case FunctionType.PM10: - _levelColorList.Add(0xFFADE764); - _levelColorList.Add(0xFFFFD154); - _levelColorList.Add(0xFFFF9D54); - _levelColorList.Add(0xFFFF3D3D); - break; case FunctionType.PM25: _levelColorList.Add(0xFFADE764); _levelColorList.Add(0xFFFFD154); _levelColorList.Add(0xFFFF9D54); _levelColorList.Add(0xFFFF3D3D); - break; - //case FunctionType.Noise: - - // break; - case FunctionType.WindPower: - break; case FunctionType.CO2: _levelColorList.Add(0xFFADE764); @@ -285,23 +246,11 @@ _levelTextList = new List<int>(); switch (functionType) { - case FunctionType.PM10: - _levelTextList.Add(StringId.Great); - _levelTextList.Add(StringId.Good); - _levelTextList.Add(StringId.MildPollution); - _levelTextList.Add(StringId.HeavyPollution); - break; case FunctionType.PM25: _levelTextList.Add(StringId.Great); _levelTextList.Add(StringId.Good); _levelTextList.Add(StringId.MildPollution); _levelTextList.Add(StringId.HeavyPollution); - break; - //case FunctionType.Noise: - - // break; - case FunctionType.WindPower: - break; case FunctionType.CO2: _levelTextList.Add(StringId.SensorReferenceTipCO2Level1); @@ -348,16 +297,6 @@ int level = 1; switch (functionType) { - case FunctionType.PM10: - if (values < 35) - level = 1; - else if (values < 75) - level = 2; - else if (values < 115) - level = 3; - else if (values > 115) - level = 4; - break; case FunctionType.PM25: if (values < 35) level = 1; @@ -367,12 +306,6 @@ level = 3; else if (values > 115) level = 4; - break; - //case FunctionType.Noise: - - // break; - case FunctionType.WindPower: - break; case FunctionType.CO2: if (values < 1000) -- Gitblit v1.8.0