From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01

---
 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 96da5d9..a30b951 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -74,7 +74,7 @@
             };
             bodyView.AddChidren(functionListView);
 
-            foreach (var function in DB_ResidenceData.residenceData.functionList.functions)
+            foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
             {
                 if (titleId == StringId.Lights)
                 {
@@ -116,10 +116,7 @@
                 if (titleId == StringId.EnvironmentalScience)
                 {
 
-                    if (function.functionType != FunctionType.PM10 ||
-                    function.functionType != FunctionType.PM25 ||
-                    //function.functionType != FunctionType.Noise ||
-                    function.functionType != FunctionType.WindPower ||
+                    if (function.functionType != FunctionType.PM25 ||
                     function.functionType != FunctionType.CO2 ||
                     function.functionType != FunctionType.Temp ||
                     function.functionType != FunctionType.TVOC ||

--
Gitblit v1.8.0