From 64b84c33e8733228c624d07229026470497eb417 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 10:41:16 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/Entity/Function/Sensor.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index c8b1c7b..0141474 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,21 +49,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> { "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)
+#if DEBUG1
+ //if ( Convert.ToInt32(trait_values.value) == 0)
{
double level = 1;
Random random = new Random();
@@ -85,12 +85,14 @@
level = Math.Round(random.NextDouble() * 100, 0);
break;
}
- trait_values.value = level;
+ trait_values.curValue = level;
}
#endif
}
- return Convert.ToDouble(trait_values.value);
+ if (trait_values.curValue.ToString() == "{}")
+ trait_values.curValue = 0;
+ return Convert.ToDouble(trait_values.curValue);
}
set
{
@@ -99,21 +101,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