From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/Entity/Function/Sensor.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 9710407..3244716 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,18 +49,18 @@
{
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)
@@ -85,12 +85,12 @@
level = Math.Round(random.NextDouble() * 100, 0);
break;
}
- trait_values.value = level;
+ trait_values.curValue = level;
}
#endif
}
- return Convert.ToDouble(trait_values.value);
+ return Convert.ToDouble(trait_values.curValue);
}
set
{
@@ -99,21 +99,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