From b69d7735274b8d0f741da8a6bb8b8e1347477a5a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 19 三月 2020 17:14:16 +0800
Subject: [PATCH] 20200319
---
HDL_ON/Entity/Function/FunctionList.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/FunctionList.cs b/HDL_ON/Entity/Function/FunctionList.cs
index 44eba77..3ab69c5 100644
--- a/HDL_ON/Entity/Function/FunctionList.cs
+++ b/HDL_ON/Entity/Function/FunctionList.cs
@@ -14,10 +14,21 @@
public void GetAllFunction()
{
functions.Clear();
- functions.AddRange(aCs);
- functions.AddRange(lights);
- functions.AddRange(curtains);
- functions.AddRange(floorHeatings);
+ functions.AddRange(GetAllDeviceFunctionList());
+ functions.AddRange(scenes);
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧鍔熻兘鍒楄〃
+ /// </summary>
+ public List<Function> GetAllDeviceFunctionList()
+ {
+ var deviceFunctionList = new List<Function>();
+ deviceFunctionList.AddRange(aCs);
+ deviceFunctionList.AddRange(lights);
+ deviceFunctionList.AddRange(curtains);
+ deviceFunctionList.AddRange(floorHeatings);
+ return deviceFunctionList;
}
public List<AC> aCs = new List<AC>();
@@ -27,5 +38,8 @@
public List<Curtain> curtains = new List<Curtain>();
public List<FloorHeating> floorHeatings = new List<FloorHeating>();
+
+ public List<Scene> scenes = new List<Scene>();
+
}
}
--
Gitblit v1.8.0