From c209a50cabf524c146fb2d02ce09cfc46c7c2f70 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 26 五月 2020 13:49:02 +0800
Subject: [PATCH] 2020-05-26-1
---
HDL_ON/Entity/FunctionList.cs | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index eb8157c..ee02b6c 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -1,9 +1,10 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Linq;
namespace HDL_ON.Entity
{
- public class FunctionList
+ public class FunctionList
{
/// <summary>
/// 绌鸿皟鍒楄〃
@@ -22,9 +23,34 @@
/// </summary>
public List<FloorHeating> floorHeatings = new List<FloorHeating>();
/// <summary>
+ /// 瀹剁數鍒楄〃
+ /// </summary>
+ public List<Function> electricals
+ {
+ get
+ {
+ var list = new List<Function>();
+ list.AddRange(fans);
+ list.AddRange(switchSockets);
+ list.AddRange(tVs);
+ return list;
+ }
+ }
+ /// <summary>
+ /// 椋庢墖鍒楄〃
+ /// </summary>
+ public List<Fan> fans = new List<Fan>();
+ public List<TV> tVs = new List<TV>();
+ /// <summary>
+ /// 瀹剁數鍒楄〃
+ /// </summary>
+ public List<SwitchSocket> switchSockets = new List<SwitchSocket>();
+
+ /// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
public List<Scene> scenes = new List<Scene>();
+
[Newtonsoft.Json.JsonIgnore]
public List<Function> functions = new List<Function>();
@@ -49,8 +75,11 @@
deviceFunctionList.AddRange(lights);
deviceFunctionList.AddRange(curtains);
deviceFunctionList.AddRange(floorHeatings);
- return deviceFunctionList;
+ deviceFunctionList.AddRange(electricals);
+
+ return deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
}
}
+
}
--
Gitblit v1.8.0