From db45c85a6ddebc5018b32a9d9dc04f839db3fa76 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 28 九月 2021 15:59:34 +0800 Subject: [PATCH] 组合调光 --- HDL_ON/Entity/FunctionList.cs | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs index d95e1ba..aee9ad3 100644 --- a/HDL_ON/Entity/FunctionList.cs +++ b/HDL_ON/Entity/FunctionList.cs @@ -128,7 +128,7 @@ /// </summary> public List<Function> GetEnvirSensorsList() { - var spkList = SPK.EnvironSpkList(); + var spkList = SPK.EnvironDeviceSpkList(); return Functions.FindAll((obj) => spkList.Contains(obj.spk)); } /// <summary> @@ -415,24 +415,7 @@ { foreach (var function in GetDeviceFunctionList(SPK.BrandType.Hdl)) { - switch (function.Spk_Prefix) - { - case FunctionCategory.Music: - case FunctionCategory.DryContact: - continue; - } - DriverLayer.Control.Ins.SendReadCommand(function); - //switch (function.Spk_Prefix) - //{ - // case FunctionCategory.Light: - // case FunctionCategory.Electric: - // case FunctionCategory.Curtain: - // case FunctionCategory.AC: - // case FunctionCategory.FloorHeat: - // case FunctionCategory.Sensor: - // DriverLayer.Control.Ins.SendReadCommand(function); - // break; - //} + Control.Ins.SendReadCommand(function); } if(DB_ResidenceData.Instance.GatewayType == 1) { -- Gitblit v1.8.0