From c5a873df96e4a797426e4dd5eafe5b43f7aea564 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 19 十二月 2020 15:41:53 +0800
Subject: [PATCH] 20201218-2

---
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
old mode 100644
new mode 100755
index 89cd0cb..258637d
--- 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,9 +904,9 @@
                             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)
                         {

--
Gitblit v1.8.0