From 6e580804d74d7a6fb118b6ba381e88aa81f267c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 三月 2021 15:30:23 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 91c286b..1536bbb 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -83,31 +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.sensorsArm);
+ functionList.AddRange(FunctionList.List.GetArmSensorList());
}
functionList.OrderByDescending(o => o.controlCounter).ToList();
--
Gitblit v1.8.0