From c7f6a15a17344e55f0c2349392501100ba2a206e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 27 九月 2021 09:33:27 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 2b40f4b..51ee8b6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -233,7 +233,7 @@
#endregion
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
#region 鐣岄潰
///寮�鍏�
@@ -313,6 +313,7 @@
}
break;
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
{
#region 鐣岄潰
///寮�鍏�
@@ -437,8 +438,7 @@
break;
}
case SPK.AcStandard:
- case SPK.FloorHeatStandard:
- case SPK.AirFreshStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
//鍋氫簡涓�涓壒娈婂鐞嗭紱
bool _bool = false;
@@ -462,6 +462,7 @@
}
}
break;
+
}
outputDevice.status = dicSateteList;
--
Gitblit v1.8.0