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/TargetDeviceFunList.cs | 40 ++++++----------------------------------
1 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 0ab9c3b..dcbac35 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -132,6 +132,7 @@
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
{
#region 鐣岄潰
///寮�鍏�
@@ -233,7 +234,7 @@
#endregion
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
#region 鐣岄潰
///寮�鍏�
@@ -313,6 +314,7 @@
}
break;
case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
{
#region 鐣岄潰
///寮�鍏�
@@ -436,8 +438,9 @@
}
break;
}
+ case SPK.HvacAC:
case SPK.AcStandard:
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
//鍋氫簡涓�涓壒娈婂鐞嗭紱
bool _bool = false;
@@ -461,38 +464,7 @@
}
}
break;
- case SPK.AirFreshStandard:
- {
- //鍋氫簡涓�涓壒娈婂鐞嗭紱
- bool _bool = false;
- for (int i = 0; i < dicSateteList.Count; i++)
- {
- var dic = dicSateteList[i];
- if (dic.ContainsValue("on_off"))
- {
- if (dic["on_off"] == "on")
- {
- //鍒ゆ柇鏄惁瀛樺湪涓旀槸寮�鐘舵��
- _bool = true;
- break;
- }
- }
- }
-
- if (!_bool)
- {
- //濡傛灉鏂伴鍚湁寮�鍏冲睘鎬т笖鏄叧=鐘舵�侊紱
- //娓呯┖鍒楄〃鎵�鏈夋暟鎹紝閲嶆柊鍗曠嫭閰嶇疆涓�涓紑鍏冲睘鎬т笖鏄叧=鐘舵�侊紱
- //(鏂伴灞炴�ф槸鍗曠嫭鎺у埗鐨�,濡傛灉閰嶇疆鍏筹紝鍐嶉厤缃竴涓閫燂紝椋庨�熶竴鏍锋墽琛�)
- dicSateteList.Clear();
- //娌℃湁寮�鍏冲氨榛樿娣诲姞-寮�-灞炴��
- Dictionary<string, string> diction = new Dictionary<string, string>();
- diction.Add("key", "on_off");
- diction.Add("value", "off");
- dicSateteList.Add(diction);
- }
- }
- break;
+
}
outputDevice.status = dicSateteList;
--
Gitblit v1.8.0