From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 96da5d9..6a220fa 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 ||
@@ -139,7 +136,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.functionCategory.ToString() + "-" + function.functionType
+ Tag = function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
@@ -155,7 +152,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.functionCategory.ToString() + "-" + function.functionType
+ Tag = function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
--
Gitblit v1.8.0