From 0ab9960587ececb5d3e13e7fb062e2f67308f9e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:33:03 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index b979155..223b059 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -146,12 +146,13 @@
case SPK.CurtainRoller:
case SPK.CurtainTrietex:
//绌鸿皟
- case SPK.AcStandard:
+ case SPK.AcStandard:case SPK.HvacAC:
//鍦扮儹
- case SPK.FloorHeatStandard:
+ case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
//鏂伴
case SPK.AirFreshStandard:
- {//寮�鍏崇伅
+ case SPK.HvacAirFresh:
+ {//寮�鍏崇伅
foreach (var dic in dicList)
{
@@ -205,6 +206,7 @@
}
break;
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
{
foreach (var dic in dicList)
{
@@ -269,6 +271,7 @@
switch (dic["key"])
{
case "status":
+ case "people_status":
{
if (value == "true")
{
@@ -302,6 +305,7 @@
}
break;
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
{
foreach (var dic in dicList)
{
@@ -975,6 +979,7 @@
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
{
string on_off = GetKeyValue("on_off", dicList);
string set_temp = GetKeyValue("set_temp", dicList);
@@ -1073,7 +1078,7 @@
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
string on_off = GetKeyValue("on_off", dicList);
string set_temp = GetKeyValue("set_temp", dicList);
@@ -1146,6 +1151,7 @@
}
break;
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
{
string on_off = GetKeyValue("on_off", dicList);
string fan = GetKeyValue("fan", dicList);
@@ -1432,6 +1438,7 @@
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
{
foreach (var dic in dicList)
{
@@ -1542,7 +1549,7 @@
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
foreach (var dic in dicList)
@@ -1626,6 +1633,7 @@
}
break;
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
{
foreach (var dic in dicList)
@@ -1650,8 +1658,8 @@
}
}
break;
-
- case "fan":
+
+ case "fan":
{
if (button2 == null)
{
@@ -1726,6 +1734,7 @@
}
break;
case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
{
foreach (var dic in dicList)
{
@@ -1783,6 +1792,7 @@
switch (dic["key"])
{
case "status":
+ case "people_status":
{
if (value == "true")
{
@@ -1815,6 +1825,7 @@
}
break;
case SPK.SenesorMegahealth:
+ case SPK.SenesorMegahealth2:
{
foreach (var dic in dicList)
{
@@ -1983,7 +1994,8 @@
}
break;
case SPK.AcStandard:
- case SPK.FloorHeatStandard:
+ case SPK.HvacAC:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
foreach (var dic in dicList)
{
--
Gitblit v1.8.0