From ccd5b1c8dc2d0399745779fb4f9a261d24d75a6d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 23 十一月 2021 14:43:13 +0800 Subject: [PATCH] 备份 --- HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs index 223b059..61973d1 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs @@ -135,7 +135,8 @@ //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬� switch (device.spk) { - //寮�鍏崇伅鍏� light.Switch + //寮�鍏崇伅鍏� + case SPK.AirSwitch: case SPK.LightDimming: case SPK.LightRGB: case SPK.LightRGBW: @@ -152,7 +153,10 @@ //鏂伴 case SPK.AirFreshStandard: case SPK.HvacAirFresh: - {//寮�鍏崇伅 + //鎻掑骇 + case SPK.PanelSocket: + case SPK.ElectricSocket: + {//寮�鍏崇伅 foreach (var dic in dicList) { @@ -906,8 +910,12 @@ //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬� switch (device.spk) { + case SPK.AirSwitch: case SPK.LightSwitch: - {//寮�鍏崇伅 + //鎻掑骇 + case SPK.PanelSocket: + case SPK.ElectricSocket: + {//寮�鍏� foreach (var dic in dicList) { @@ -1355,7 +1363,11 @@ { switch (device.spk) { + //鎻掑骇 + case SPK.PanelSocket: + case SPK.ElectricSocket: //寮�鍏崇伅鍏� + case SPK.AirSwitch: case SPK.LightSwitch: { foreach (var dic in dicList) @@ -1922,6 +1934,7 @@ //鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬� switch (device.spk) { + case SPK.AirSwitch: case SPK.LightSwitch: {//寮�鍏崇伅 -- Gitblit v1.8.0