From dc6b96a219645c1125de6d6bb5e94d61cf167be1 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 17:37:53 +0800
Subject: [PATCH] 2021-8-21-1

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index d6af876..168b3fc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -104,7 +104,6 @@
                         {
                             GetEditState(device, index, view.btnState, null, null, null);
                         }
-
                     }
                     break;
                 //骞叉帴鐐�
@@ -204,6 +203,8 @@
                     break;
                 //鐜妫�娴嬩紶鎰熷櫒
                 case SPK.SensorEnvironment:
+                case SPK.SensorEnvironment2:
+                case SPK.SensorEnvironment3:
                     {
                         #region 鐣岄潰
                         ///娓╁害
@@ -229,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