From 8784b669c284e02f0a4d2d9aacefc408196c8583 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index c988fc3..b6334d8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -346,6 +346,7 @@
case SPK.CurtainSwitch:
case SPK.CurtainRoller:
case SPK.CurtainTrietex:
+ case SPK.CurtainDream:
{
strPath = "LogicIcon/curtainlogic.png";
}
@@ -432,7 +433,8 @@
var curtainjosn = deviceList.Find((device) =>
device.spk == SPK.CurtainSwitch
|| device.spk == SPK.CurtainTrietex
- || device.spk == SPK.CurtainRoller);
+ || device.spk == SPK.CurtainRoller
+ || device.spk == SPK.CurtainDream);
if (curtainjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
@@ -528,6 +530,7 @@
functionTypeList.Add(SPK.CurtainSwitch);
functionTypeList.Add(SPK.CurtainRoller);
functionTypeList.Add(SPK.CurtainTrietex);
+ functionTypeList.Add(SPK.CurtainDream);
}
///绌鸿皟绫�
else if (deviceType == Language.StringByID(StringId.AC))
@@ -704,6 +707,7 @@
deviceTypeList.Add(SPK.AirSwitch);
deviceTypeList.Add(SPK.PanelSocket);
deviceTypeList.Add(SPK.ElectricSocket);
+ deviceTypeList.Add(SPK.CurtainDream);
}
break;
}
--
Gitblit v1.8.0