From 475ccc9f21022ce66981effcedf8de339fc98a2f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 十月 2021 11:15:31 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 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..cc30118 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:
@@ -906,6 +907,7 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
+ case SPK.AirSwitch:
case SPK.LightSwitch:
{//寮�鍏崇伅
@@ -1356,6 +1358,7 @@
switch (device.spk)
{
//寮�鍏崇伅鍏�
+ case SPK.AirSwitch:
case SPK.LightSwitch:
{
foreach (var dic in dicList)
@@ -1922,6 +1925,7 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
+ case SPK.AirSwitch:
case SPK.LightSwitch:
{//寮�鍏崇伅
--
Gitblit v1.8.0