From e7290281eabcb88d2e430dea9782565474837ce1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 20 十月 2023 14:29:54 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 80b27c9..094b08e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -370,13 +370,13 @@
{
return "FunctionIcon/DoorLock/DoorLock.png";
}
- else if (SPK.SensorDryContact == device.spk
- || SPK.SensorDryContact2 == device.spk
- || SPK.OtherCommon == device.spk
- )
- {
- return "LogicIcon/ganjiedian.png";
- }
+ //else if (SPK.SensorDryContact == device.spk
+ // || SPK.SensorDryContact2 == device.spk
+ // || SPK.OtherCommon == device.spk
+ // )
+ //{
+ // return "LogicIcon/ganjiedian.png";
+ //}
else if (SPK.SensorLight == device.spk)
{
return "LogicIcon/lightloguc.png";
--
Gitblit v1.8.0