From c8dfa6df784741900a4c06918929d3db3c876234 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 16 七月 2021 10:40:56 +0800
Subject: [PATCH] Merge branch 'hxb-test' into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index c75cf65..cd99561 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -280,7 +280,7 @@
name = sensor.name,
sid = sensor.sid,
deviceId = sensor.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = seTemp.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = seTemp.state, curValue = seTemp.curValue } },
};
switch (seTemp.key)
{
@@ -310,8 +310,8 @@
continue;
#endif
LoadSensorDiv(sensor, index);
+ index++;
}
- index++;
new System.Threading.Thread(() =>
{
@@ -757,7 +757,7 @@
name = updateTemp.name,
sid = updateTemp.sid,
deviceId = updateTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = seTemp.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = seTemp.state ,curValue = seTemp.curValue} },
};
switch (seTemp.key)
{
--
Gitblit v1.8.0