From 610a6a826a00d47320b17478cb5ca5f60abfa291 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 24 五月 2022 17:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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..d863ed5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -397,6 +397,11 @@
strPath = "LogicIcon/sensor.png";
}
break;
+ case SPK.DoorLock:
+ {
+ strPath = "FunctionIcon/DoorLock/DoorLock.png";
+ }
+ break;
}
return strPath;
@@ -488,6 +493,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;
}
@@ -568,6 +579,11 @@
functionTypeList.Add(SPK.AirSwitch);
functionTypeList.Add(SPK.PanelSocket);
functionTypeList.Add(SPK.ElectricSocket);
+ }
+ ///闂ㄩ攣绫�
+ else if (deviceType == Language.StringByID(StringId.DoorLock))
+ {
+ functionTypeList.Add(SPK.DoorLock);
}
else
{
@@ -668,6 +684,7 @@
deviceTypeList.Add(SPK.ElectricSocket);
deviceTypeList.Add(SPK.HvacCac);
deviceTypeList.Add(SPK.SensorHelp);
+ deviceTypeList.Add(SPK.DoorLock);
}
break;
--
Gitblit v1.8.0