From f9f9b0030fdd2691632569b7dcad9d0ddca5e4cf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 09:28:54 +0800
Subject: [PATCH] 2020-12-23 1.调整mqtt挤下线，跑ui线程。2.LoadEvent_CheckLinkStatus方法调整
---
HDL_ON/Entity/Function/Sensor.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
old mode 100755
new mode 100644
index e482294..0141474
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -49,20 +49,20 @@
{
if (trait_values == null)
{
- trait_values = attributes.Find((obj) => obj.key == "values");
+ trait_values = attributes.Find((obj) => obj.key == FunctionAttributeKey.Value);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
trait_values = new FunctionAttributes()
{
- key = "values",
+ key = FunctionAttributeKey.Value,
value = new List<string> { "29" },
max = 10000,
min = 0,
};
trait_values.curValue = trait_values.min;
}
-#if DEBUG
+#if DEBUG1
//if ( Convert.ToInt32(trait_values.value) == 0)
{
double level = 1;
@@ -90,6 +90,8 @@
#endif
}
+ if (trait_values.curValue.ToString() == "{}")
+ trait_values.curValue = 0;
return Convert.ToDouble(trait_values.curValue);
}
set
@@ -99,13 +101,13 @@
{
if (trait_values == null)
{
- trait_values = attributes.Find((obj) => obj.key == "values");
+ trait_values = attributes.Find((obj) => obj.key == FunctionAttributeKey.Value);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
trait_values = new FunctionAttributes()
{
- key = "values",
+ key = FunctionAttributeKey.Value,
value = new List<string> { "up" },
max = 100,
min = 0,
--
Gitblit v1.8.0