From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 486fd90..ea5c8f9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -164,7 +164,7 @@
case SPK.HvacAC:
case SPK.AcIr:
//鍦扮儹
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
case SPK.FloorHeatStandard:
//鏂伴
case SPK.AirFreshStandard:
@@ -1360,7 +1360,7 @@
}
break;
case SPK.FloorHeatStandard:
- case SPK.HvacFloorHeat:
+ case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
{
string on_off = GetKeyValue("on_off", dicList);
string set_temp = GetKeyValue("set_temp", dicList);
@@ -2059,7 +2059,7 @@
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
case SPK.HvacFloorHeat:
{
@@ -2691,7 +2691,7 @@
case SPK.AcStandard:
case SPK.HvacAC:
case SPK.AcIr:
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
case SPK.HvacFloorHeat:
{
string value = this.GetValue(dicList);
--
Gitblit v1.8.0