From c047239d340038cea872bae276e713ef866c0a34 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 02 三月 2021 13:22:21 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index df31fec..cd334f8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -281,16 +281,22 @@
                             value = "off";
                         }
                         break;
-                    case StringId.youren:
-                    case StringId.kaiqi:
-                        {
+                    case StringId.youren: {
                             value = "true";
                         }
                         break;
-                    case StringId.wuren:
+                    case StringId.wuren: {
+                            value = "false";
+                        }
+                        break;
+                    case StringId.kaiqi:
+                        {
+                            value = "open";
+                        }
+                        break;
                     case StringId.bihe:
                         {
-                            value = "false";
+                            value = "close";
                         }
                         break;
                     case StringId.zaixian: {

--
Gitblit v1.8.0