2020-06-16-1

陈嘉乐

2020-06-16 7167334c0e89dd84827d59e726123d14776e3a09

 HDL_ON/Entity/FunctionList.cs

@@ -1,9 +1,10 @@
using 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();
        }

    }
    
}