From 56dfdc1bf7e7f2bb2456f29c3686dfa935a89e80 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 13:59:45 +0800
Subject: [PATCH] 2022年06月30日13:59:08
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 8bfe344..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";
}
@@ -397,6 +398,11 @@
strPath = "LogicIcon/sensor.png";
}
break;
+ case SPK.DoorLock:
+ {
+ strPath = "FunctionIcon/DoorLock/DoorLock.png";
+ }
+ break;
}
return strPath;
@@ -427,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));
@@ -488,6 +495,12 @@
{
deviceStrTypeList.Add(Language.StringByID(StringId.Electric));
}
+ ///闂ㄩ攣绫�
+ var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock);
+ if (doorlock != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
+ }
return deviceStrTypeList;
}
@@ -517,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))
@@ -569,6 +583,11 @@
functionTypeList.Add(SPK.PanelSocket);
functionTypeList.Add(SPK.ElectricSocket);
}
+ ///闂ㄩ攣绫�
+ else if (deviceType == Language.StringByID(StringId.DoorLock))
+ {
+ functionTypeList.Add(SPK.DoorLock);
+ }
else
{
functionTypeList.Add(SPK.LightSwitch);
@@ -614,7 +633,7 @@
functionTypeList.Add(SPK.ElectricSocket);
functionTypeList.Add(SPK.HvacCac);
functionTypeList.Add(SPK.SensorHelp);
-
+ functionTypeList.Add(SPK.DoorLock);
}
@@ -668,6 +687,7 @@
deviceTypeList.Add(SPK.ElectricSocket);
deviceTypeList.Add(SPK.HvacCac);
deviceTypeList.Add(SPK.SensorHelp);
+ deviceTypeList.Add(SPK.DoorLock);
}
break;
@@ -687,6 +707,7 @@
deviceTypeList.Add(SPK.AirSwitch);
deviceTypeList.Add(SPK.PanelSocket);
deviceTypeList.Add(SPK.ElectricSocket);
+ deviceTypeList.Add(SPK.CurtainDream);
}
break;
}
--
Gitblit v1.8.0