From 848dc3467aa22af89e6a4c0a8703ca83cb0b7b06 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 17:23:44 +0800
Subject: [PATCH] 20000
---
HDL_ON/Entity/Function/Sensor.cs | 59 +++++++++++++++++++----------------------------------------
1 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index c8b1c7b..17475e4 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -38,7 +38,7 @@
}
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_values;
+ public FunctionAttributes trait_values;
/// <summary>
/// 鍊�
/// </summary>
@@ -49,48 +49,27 @@
{
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.name == "values");
+ trait_values = attributes.Find((obj) => obj.key == FunctionAttributeKey.Value);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
- trait_values = new Trait()
+ trait_values = new FunctionAttributes()
{
- name = "values",
- value_key = new List<string> { "29" },
+ key = FunctionAttributeKey.Value,
+ value = new List<string> { "29" },
max = 10000,
min = 0,
};
- trait_values.value = trait_values.min;
+ trait_values.curValue = trait_values.min;
}
-#if DEBUG
- if (Convert.ToInt32(trait_values.value) == 0)
- {
- double level = 1;
- Random random = new Random();
- switch (functionType)
- {
- case FunctionType.PM25:
- level = Math.Round(random.NextDouble() * 130, 0);
- break;
- case FunctionType.CO2:
- level = Math.Round(random.NextDouble() * 6000, 0);
- break;
- case FunctionType.Temp:
- level = Math.Round(random.NextDouble() * 40, 0);
- break;
- case FunctionType.TVOC:
- level = Math.Round(random.NextDouble() * 10, 1);
- break;
- case FunctionType.Humidity:
- level = Math.Round(random.NextDouble() * 100, 0);
- break;
- }
- trait_values.value = level;
- }
-#endif
-
}
- return Convert.ToDouble(trait_values.value);
+ if (trait_values.curValue.ToString() == "{}")
+ trait_values.curValue = 0;
+ if(spk == SPK.SensorTVOC)
+ {
+ return Convert.ToDouble(trait_values.curValue.ToString()) / 100000;
+ }
+ return Convert.ToDouble(trait_values.curValue);
}
set
{
@@ -99,21 +78,21 @@
{
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.name == "values");
+ trait_values = attributes.Find((obj) => obj.key == FunctionAttributeKey.Value);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
- trait_values = new Trait()
+ trait_values = new FunctionAttributes()
{
- name = "values",
- value_key = new List<string> { "up" },
+ key = FunctionAttributeKey.Value,
+ value = new List<string> { "up" },
max = 100,
min = 0,
};
}
- trait_values.value = trait_values.min;
+ trait_values.curValue = trait_values.min;
}
- trait_values.value = value;
+ trait_values.curValue = value;
MainPage.Log($"values 鏁版嵁鍒锋柊{value}.");
}
catch
--
Gitblit v1.8.0