From bce17e5a91e596d29209056e2e4ac3a6f88c2219 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 10:03:53 +0800
Subject: [PATCH] 海林传感器

---
 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index f0fdbc0..f704df6 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -32,6 +32,22 @@
                 if (bodyView != null)
                 {
                     var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
+                    var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+                    foreach (var enviTemp in enviSensorList)
+                    {
+                        var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "humidity");
+                        if (tempAttr != null)
+                        {
+                            var newTemp = new Function()
+                            {
+                                name = enviTemp.name,
+                                sid = enviTemp.sid,
+                                deviceId = enviTemp.deviceId,
+                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
+                            };
+                            humiSensorList.Add(newTemp);
+                        }
+                    }
                     double humiTotalValues = 0;
                     foreach (var temp in humiSensorList)
                     {
@@ -58,6 +74,22 @@
                 if (bodyView != null)
                 {
                     var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
+                    var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+                    foreach (var enviTemp in enviSensorList)
+                    {
+                        var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
+                        if (tempAttr != null)
+                        {
+                            var newTemp = new Function()
+                            {
+                                name = enviTemp.name,
+                                sid = enviTemp.sid,
+                                deviceId = enviTemp.deviceId,
+                                attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
+                            };
+                            tempSensorList.Add(newTemp);
+                        }
+                    }
                     double tempTotalValues = 0;
                     foreach (var temp in tempSensorList)
                     {

--
Gitblit v1.8.0