From b71dfb3ca100340005d56e1298292807da82322d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 六月 2020 15:04:21 +0800
Subject: [PATCH] 20200608
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 668f718..44056f2 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -97,8 +97,37 @@
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.PM10 ||
+ function.functionType != FunctionType.PM25 ||
+ function.functionType != FunctionType.Noise ||
+ function.functionType != FunctionType.WindPower ||
+ 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 +160,7 @@
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
}
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
}
}
--
Gitblit v1.8.0