From 1d25d355cb0efc9685a8ad5c870b5941b95ce9b8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 30 三月 2021 09:11:57 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 07790c3..1536bbb 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -83,27 +83,31 @@
if (titleId == StringId.Lights)
{
- functionList.AddRange(FunctionList.List.lights);
+ functionList.AddRange(FunctionList.List.GetLightList());
}
else if (titleId == StringId.AC)
{
- functionList.AddRange(FunctionList.List.aCs);
+ functionList.AddRange(FunctionList.List.GetAcList());
}
else if (titleId == StringId.Curtain)
{
- functionList.AddRange(FunctionList.List.curtains);
+ functionList.AddRange(FunctionList.List.GetCurtainList());
}
else if (titleId == StringId.FloorHeating)
{
- functionList.AddRange(FunctionList.List.floorHeatings);
+ functionList.AddRange(FunctionList.List.GetFloorHeatingList());
}
else if (titleId == StringId.Electric)
{
- functionList.AddRange(FunctionList.List.electricals);
+ functionList.AddRange(FunctionList.List.GetElectricals());
}
else if (titleId == StringId.EnvironmentalScience)
{
- functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience);
+ functionList.AddRange(FunctionList.List.GetEnvirSensorsList());
+ }
+ else if (titleId == StringId.Sensor)
+ {
+ functionList.AddRange(FunctionList.List.GetArmSensorList());
}
functionList.OrderByDescending(o => o.controlCounter).ToList();
@@ -121,7 +125,7 @@
foreach (var function in showList)
{
- if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
+ if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function)
{
@@ -132,7 +136,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.sid
+ Tag = function.spk + function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
@@ -148,7 +152,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.sid
+ Tag = function.spk + function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
--
Gitblit v1.8.0