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/ConditionDeviceFunList.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 4d390cb..fa3e9d5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -48,6 +48,7 @@
switch (device.spk)
{
//寮�鍏崇伅鍏� light.Switch
+ case SPK.AirSwitch:
case SPK.LightDimming:
case SPK.LightRGB:
case SPK.LightRGBW:
@@ -118,6 +119,7 @@
break;
//骞叉帴鐐�
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
view.btnText.TextID = StringId.switchLogic;
@@ -485,6 +487,7 @@
break;
case SPK.SensorDoorWindow:
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
{
keyVlaue = "status";
if (!Is_SpkAttribute(keyVlaue))
--
Gitblit v1.8.0