From f4c86f68b900bd506ef7214b2ae9bd23a9d2ffa8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 19 十二月 2020 17:48:11 +0800
Subject: [PATCH] 完成筛选房间的功能
---
HDL_ON/Entity/Function/Sensor.cs | 97 +++++++-----------------------------------------
1 files changed, 15 insertions(+), 82 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
old mode 100644
new mode 100755
index ba5dcfa..e482294
--- 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;
@@ -49,7 +38,7 @@
}
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_values;
+ public FunctionAttributes trait_values;
/// <summary>
/// 鍊�
/// </summary>
@@ -60,35 +49,28 @@
{
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.attri == "values");
+ trait_values = attributes.Find((obj) => obj.key == "values");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
- trait_values = new Trait()
+ trait_values = new FunctionAttributes()
{
- attri = "values",
+ key = "values",
value = new List<string> { "29" },
max = 10000,
min = 0,
};
- trait_values.curValues = trait_values.min;
+ trait_values.curValue = 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.curValue = level;
}
#endif
}
- return Convert.ToDouble(trait_values.curValues);
+ return Convert.ToDouble(trait_values.curValue);
}
set
{
try
- {
+
+ {
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.attri == "values");
+ trait_values = attributes.Find((obj) => obj.key == "values");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
- trait_values = new Trait()
+ trait_values = new FunctionAttributes()
{
- attri = "values",
+ key = "values",
value = new List<string> { "up" },
max = 100,
min = 0,
};
}
- trait_values.curValues = trait_values.min;
+ trait_values.curValue = trait_values.min;
}
- trait_values.curValues = value;
+ trait_values.curValue = 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