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 | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs index 5790cc2..52305af 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs @@ -324,6 +324,8 @@ strPath = "FunctionIcon/Icon/electricalbreaker.png"; } break; + case SPK.PanelSocket: + case SPK.ElectricSocket: case SPK.LightSwitch: case SPK.LightRGB: case SPK.LightRGBW: @@ -401,7 +403,10 @@ || device.spk == SPK.LightCCT || device.spk == SPK.LightRGB || device.spk == SPK.LightRGBW - || device.spk == SPK.AirSwitch); + || device.spk == SPK.AirSwitch + || device.spk == SPK.PanelSocket + || device.spk == SPK.ElectricSocket + ); if (lightjosn != null) { deviceStrTypeList.Add(Language.StringByID(StringId.Lights)); @@ -475,7 +480,9 @@ functionTypeList.Add(SPK.LightRGB); functionTypeList.Add(SPK.LightRGBW); functionTypeList.Add(SPK.LightCCT); - functionTypeList.Add(SPK.AirSwitch); + functionTypeList.Add(SPK.AirSwitch); + functionTypeList.Add(SPK.PanelSocket); + functionTypeList.Add(SPK.ElectricSocket); } else if (deviceType == Language.StringByID(StringId.Curtain)) { @@ -567,6 +574,8 @@ deviceTypeList.Add(SPK.SensorTVOC); deviceTypeList.Add(SPK.SensorHcho); deviceTypeList.Add(SPK.AirSwitch); + deviceTypeList.Add(SPK.PanelSocket); + deviceTypeList.Add(SPK.ElectricSocket); } break; @@ -584,6 +593,8 @@ 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