From bfb9e8297311985a2614f73ce288051ecbf9f8b5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 十一月 2021 11:52:02 +0800
Subject: [PATCH] 2021-11-04-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index d521916..52305af 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -318,6 +318,14 @@
string strPath = "";
switch (functionType)
{
+
+ case SPK.AirSwitch:
+ {
+ strPath = "FunctionIcon/Icon/electricalbreaker.png";
+ }
+ break;
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
case SPK.LightSwitch:
case SPK.LightRGB:
case SPK.LightRGBW:
@@ -355,6 +363,7 @@
case SPK.SensorWater:
case SPK.SensorGas:
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
case SPK.SensorShanLan:
case SPK.SensorDuiShe:
case SPK.SensorPir:
@@ -393,7 +402,11 @@
|| device.spk == SPK.LightDimming
|| device.spk == SPK.LightCCT
|| device.spk == SPK.LightRGB
- || device.spk == SPK.LightRGBW);
+ || device.spk == SPK.LightRGBW
+ || device.spk == SPK.AirSwitch
+ || device.spk == SPK.PanelSocket
+ || device.spk == SPK.ElectricSocket
+ );
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
@@ -427,7 +440,7 @@
device.spk == SPK.SensorWater
|| device.spk == SPK.SensorGas
|| device.spk == SPK.SensorSmoke
- || device.spk == SPK.SensorDryContact
+ || device.spk == SPK.SensorDryContact || device.spk == SPK.SensorDryContact2
|| device.spk == SPK.SensorShanLan
|| device.spk == SPK.SensorDuiShe
|| device.spk == SPK.SensorPir
@@ -466,7 +479,10 @@
functionTypeList.Add(SPK.LightDimming);
functionTypeList.Add(SPK.LightRGB);
functionTypeList.Add(SPK.LightRGBW);
- functionTypeList.Add(SPK.LightCCT);
+ functionTypeList.Add(SPK.LightCCT);
+ functionTypeList.Add(SPK.AirSwitch);
+ functionTypeList.Add(SPK.PanelSocket);
+ functionTypeList.Add(SPK.ElectricSocket);
}
else if (deviceType == Language.StringByID(StringId.Curtain))
{
@@ -492,7 +508,7 @@
functionTypeList.Add(SPK.SensorSmoke);
functionTypeList.Add(SPK.SensorWater);
functionTypeList.Add(SPK.SensorGas);
- functionTypeList.Add(SPK.SensorDryContact);
+ functionTypeList.Add(SPK.SensorDryContact); functionTypeList.Add(SPK.SensorDryContact2);
functionTypeList.Add(SPK.SensorShanLan);
functionTypeList.Add(SPK.SensorDuiShe);
functionTypeList.Add(SPK.SensorPir);
@@ -540,7 +556,7 @@
deviceTypeList.Add(SPK.SensorSmoke);
deviceTypeList.Add(SPK.SensorWater);
deviceTypeList.Add(SPK.SensorGas);
- deviceTypeList.Add(SPK.SensorDryContact);
+ deviceTypeList.Add(SPK.SensorDryContact); deviceTypeList.Add(SPK.SensorDryContact2);
deviceTypeList.Add(SPK.SensorShanLan);
deviceTypeList.Add(SPK.SensorDuiShe);
deviceTypeList.Add(SPK.SensorPir);
@@ -557,6 +573,9 @@
deviceTypeList.Add(SPK.SensorPm25);
deviceTypeList.Add(SPK.SensorTVOC);
deviceTypeList.Add(SPK.SensorHcho);
+ deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
@@ -573,6 +592,9 @@
deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
+ deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
}
--
Gitblit v1.8.0