From e238b9cc3caef879fd907ceab8997d08ae891ea3 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 十一月 2021 09:22:08 +0800
Subject: [PATCH] BUG修复
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 7afe5be..5790cc2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -318,6 +318,12 @@
string strPath = "";
switch (functionType)
{
+
+ case SPK.AirSwitch:
+ {
+ strPath = "FunctionIcon/Icon/electricalbreaker.png";
+ }
+ break;
case SPK.LightSwitch:
case SPK.LightRGB:
case SPK.LightRGBW:
@@ -335,16 +341,18 @@
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
{
strPath = "LogicIcon/airconditionerlogic.png";
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
strPath = "LogicIcon/heatlogic.png";
}
break;
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
{
strPath = "LogicIcon/heatlogic.png";
}
@@ -353,12 +361,14 @@
case SPK.SensorWater:
case SPK.SensorGas:
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
case SPK.SensorShanLan:
case SPK.SensorDuiShe:
case SPK.SensorPir:
case SPK.SensorDoorWindow:
case SPK.SensorUtrasonic:
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
case SPK.SensorEnvironment:
case SPK.SensorEnvironment2:
case SPK.SensorEnvironment3:
@@ -367,6 +377,7 @@
case SPK.SensorCO2:
case SPK.SensorPm25:
case SPK.SensorTVOC:
+ case SPK.SensorHcho:
{
strPath = "LogicIcon/sensor.png";
}
@@ -389,7 +400,8 @@
|| device.spk == SPK.LightDimming
|| device.spk == SPK.LightCCT
|| device.spk == SPK.LightRGB
- || device.spk == SPK.LightRGBW);
+ || device.spk == SPK.LightRGBW
+ || device.spk == SPK.AirSwitch);
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
@@ -404,17 +416,17 @@
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
}
- var ac = deviceList.Find((device) => device.spk == SPK.AcStandard);
+ var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC);
if (ac != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
}
- var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard);
+ var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard || device.spk == SPK.HvacFloorHeat);
if (floorHeating != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
}
- var airFresh = deviceList.Find((device) => device.spk == SPK.AirFreshStandard);
+ var airFresh = deviceList.Find((device) => device.spk == SPK.AirFreshStandard || device.spk == SPK.HvacAirFresh);
if (airFresh != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AirFresh));
@@ -423,13 +435,14 @@
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
|| device.spk == SPK.SensorDoorWindow
|| device.spk == SPK.SensorUtrasonic
|| device.spk == SPK.SenesorMegahealth
+ || device.spk == SPK.SenesorMegahealth2
|| device.spk == SPK.SensorEnvironment
|| device.spk == SPK.SensorEnvironment2
|| device.spk == SPK.SensorEnvironment3
@@ -438,6 +451,7 @@
|| device.spk == SPK.SensorCO2
|| device.spk == SPK.SensorPm25
|| device.spk == SPK.SensorTVOC
+ || device.spk == SPK.SensorHcho
);
if (sensor != null)
{
@@ -460,7 +474,8 @@
functionTypeList.Add(SPK.LightDimming);
functionTypeList.Add(SPK.LightRGB);
functionTypeList.Add(SPK.LightRGBW);
- functionTypeList.Add(SPK.LightCCT);
+ functionTypeList.Add(SPK.LightCCT);
+ functionTypeList.Add(SPK.AirSwitch);
}
else if (deviceType == Language.StringByID(StringId.Curtain))
{
@@ -471,27 +486,29 @@
else if (deviceType == Language.StringByID(StringId.AC))
{
functionTypeList.Add(SPK.AcStandard);
+ functionTypeList.Add(SPK.HvacAC);
}
else if (deviceType == Language.StringByID(StringId.FloorHeating))
{
- functionTypeList.Add(SPK.FloorHeatStandard);
+ functionTypeList.Add(SPK.FloorHeatStandard);functionTypeList.Add(SPK.HvacFloorHeat);
}
else if (deviceType == Language.StringByID(StringId.AirFresh))
{
- functionTypeList.Add(SPK.AirFreshStandard);
+ functionTypeList.Add(SPK.AirFreshStandard); functionTypeList.Add(SPK.HvacAirFresh);
}
else if (deviceType == Language.StringByID(StringId.Sensor))
{
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);
functionTypeList.Add(SPK.SensorDoorWindow);
functionTypeList.Add(SPK.SensorUtrasonic);
functionTypeList.Add(SPK.SenesorMegahealth);
+ functionTypeList.Add(SPK.SenesorMegahealth2);
functionTypeList.Add(SPK.SensorEnvironment);
functionTypeList.Add(SPK.SensorEnvironment2);
functionTypeList.Add(SPK.SensorEnvironment3);
@@ -500,6 +517,7 @@
functionTypeList.Add(SPK.SensorCO2);
functionTypeList.Add(SPK.SensorPm25);
functionTypeList.Add(SPK.SensorTVOC);
+ functionTypeList.Add(SPK.SensorHcho);
}
@@ -525,18 +543,20 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard);
- deviceTypeList.Add(SPK.FloorHeatStandard);
+ deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
+ deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
+ deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
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);
deviceTypeList.Add(SPK.SensorDoorWindow);
deviceTypeList.Add(SPK.SensorUtrasonic);
deviceTypeList.Add(SPK.SenesorMegahealth);
+ deviceTypeList.Add(SPK.SenesorMegahealth2);
deviceTypeList.Add(SPK.SensorEnvironment);
deviceTypeList.Add(SPK.SensorEnvironment2);
deviceTypeList.Add(SPK.SensorEnvironment3);
@@ -545,6 +565,8 @@
deviceTypeList.Add(SPK.SensorCO2);
deviceTypeList.Add(SPK.SensorPm25);
deviceTypeList.Add(SPK.SensorTVOC);
+ deviceTypeList.Add(SPK.SensorHcho);
+ deviceTypeList.Add(SPK.AirSwitch);
}
break;
@@ -558,9 +580,10 @@
deviceTypeList.Add(SPK.CurtainSwitch);
deviceTypeList.Add(SPK.CurtainRoller);
deviceTypeList.Add(SPK.CurtainTrietex);
- deviceTypeList.Add(SPK.AcStandard);
- deviceTypeList.Add(SPK.FloorHeatStandard);
- deviceTypeList.Add(SPK.AirFreshStandard);
+ 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);
}
break;
}
--
Gitblit v1.8.0