From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 7018eb5..168b3fc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -203,6 +203,8 @@
break;
//鐜妫�娴嬩紶鎰熷櫒
case SPK.SensorEnvironment:
+ case SPK.SensorEnvironment2:
+ case SPK.SensorEnvironment3:
{
#region 鐣岄潰
///娓╁害
@@ -228,7 +230,11 @@
LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
tvocView.frameLayout.Y = co2View.frameLayout.Bottom;
tvocView.btnText.TextID = StringId.tvoc;
- fLayout.AddChidren(tvocView.FLayoutView());
+ if (SPK.SensorEnvironment3 != device.spk)
+ {
+ fLayout.AddChidren(tvocView.FLayoutView());
+ }
+
#endregion
#region 鐐瑰嚮浜嬩欢
///娓╁害鐐瑰嚮浜嬩欢
--
Gitblit v1.8.0