From e74a8d9e9dc5ef2120fd811fb03a870efb96a92a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:54:23 +0800
Subject: [PATCH] 2.3图标内容
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 8d03e9a..3031525 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -189,7 +189,7 @@
list.AddRange(list2);
list.AddRange(FunctionList.List.groupControls);
#if DEBUG
- //GetTestDevice(ref list, true);
+ GetTestDevice(ref list, true);
#endif
return list;
}
@@ -361,7 +361,7 @@
}
else if (SPK.SensorPm10 == device.spk
|| SPK.SensorPirHold == device.spk
- || SPK.SensorLight == device.spk)
+ )
{
return "LogicIcon/sensor.png";
}
@@ -370,7 +370,15 @@
{
return "FunctionIcon/DoorLock/DoorLock.png";
}
-
+ else if (SPK.SensorDryContact == device.spk
+ || SPK.SensorDryContact2 == device.spk)
+ {
+ return "LogicIcon/ganjiedian.png";
+ }
+ else if (SPK.SensorLight == device.spk)
+ {
+ return "LogicIcon/lightloguc.png";
+ }
//LogicIcon/heatlogic.png"
return $"FunctionIcon/Icon/{device.IconName}.png";
@@ -1222,9 +1230,9 @@
{
//妯℃嫙璁惧
var functions = new List<Function> {
- new Entity.Function { sid = "1234567890", name = "鐓ф槑浼犳劅鍣�", spk = Entity.SPK.SensorLight },
- // new Entity.Function { sid = "1234567891", name = "娓╁害浼犳劅鍣�", spk = Entity.SPK.SensorTemperature },
- // new Entity.Function { sid = "1234567892", name = "婀垮害浼犳劅鍣�", spk = Entity.SPK.SensorHumidity },
+ new Entity.Function { sid = "1234567890", name = "鍏夌収浼犳劅鍣�", spk = Entity.SPK.SensorLight },
+ new Entity.Function { sid = "1234567891", name = "骞茶妭鐐�", spk = Entity.SPK.SensorDryContact },
+ new Entity.Function { sid = "1234567892", name = "绱ф�ユ眰鍔╀紶鎰熷櫒", spk = Entity.SPK.SensorHelp },
//new Entity.Function { sid = "12345678933456", name = "闂ㄩ攣", spk = Entity.SPK.DoorLock },
// new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
//new Entity.Function { sid = "12345678968888", name = "浜轰綋瀛樺湪浼犳劅鍣�", spk = Entity.SPK.SensorPirHold },
--
Gitblit v1.8.0