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 | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 668f718..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)
{
@@ -97,8 +97,34 @@
continue;
}
}
- functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ if(titleId == StringId.FloorHeating)
+ {
+ if(function.functionType != FunctionType.FloorHeating )
+ {
+ continue;
+ }
+ }
+ if(titleId == StringId.Electric)
+ {
+ if(function.functionType != FunctionType.Socket &&
+ function.functionType != FunctionType.TV &&
+ function.functionType != FunctionType.Fan)
+ {
+ continue;
+ }
+ }
+ if (titleId == StringId.EnvironmentalScience)
+ {
+ if (function.functionType != FunctionType.PM25 ||
+ function.functionType != FunctionType.CO2 ||
+ function.functionType != FunctionType.Temp ||
+ function.functionType != FunctionType.TVOC ||
+ function.functionType != FunctionType.Humidity)
+ {
+ continue;
+ }
+ }
if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
{
var functionDiv = new FunctionControlZone(function)
@@ -131,6 +157,7 @@
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
}
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
}
}
--
Gitblit v1.8.0