From 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 14:11:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/DAL/DriverLayer/Control.cs | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index de9a955..ae081bc 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -810,36 +810,10 @@
case SPK.SensorTVOC:
case SPK.SensorTemperature:
case SPK.SensorHumidity:
- var sensor = FunctionList.List.GetEnvirSensorsList().Find((obj) => obj.sid == updateTemp.sid);
- if (sensor != null)
- {
- localObj = sensor;
- foreach (var attr in updateTemp.status)
- {
- var localAttr = sensor.attributes.Find((obj) => obj.key == attr.key);
- if (localAttr != null)
- {
- localAttr.curValue = attr.value;
- }
- }
- EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
- }
+ EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
break;
case SPK.ElectricSocket:
- var es = FunctionList.List.GetElectricSocketList().Find((obj) => obj.sid == updateTemp.sid);
- if (es != null)
- {
- localObj = es;
- foreach (var attr in updateTemp.status)
- {
- var localAttr = es.attributes.Find((obj) => obj.key == attr.key);
- if (localAttr != null)
- {
- localAttr.curValue = attr.value;
- }
- }
- SocketPage.UpdataState(es);
- }
+ SocketPage.UpdataState(localFunction);
break;
case SPK.ElectricTV:
break;
--
Gitblit v1.8.0