From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 3f34f58..258637d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -642,7 +642,7 @@
bool initTitleButton = true;
- foreach (var tempSensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var tempSensor in FunctionList.List.sensorsEnvironmentalScience)
{
if (tempSensor.sid == sensor.sid)
{
@@ -893,7 +893,7 @@
// });
//#endif
- foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
{
if (sr.functionType != sensor.functionType)
{
@@ -904,13 +904,13 @@
i++;
continue;
}
- var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus_Data.SubnetID, sr.bus_Data.DeviceID,
- 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus_Data.LoopID, curMonth,
- DB_ResidenceData.residenceData.residenceGatewayMAC);
+ var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus.SubnetID, sr.bus.DeviceID,
+ 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus.LoopId, curMonth,
+ DB_ResidenceData.Instance.residenceGatewayMAC);
if (revertObj != null)
{
- if (revertObj.StateCode == HttpUtil.SUCCESS_CODE)
+ if (revertObj.StateCode == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>>(revertObj.ResponseData.ToString());
--
Gitblit v1.8.0