From 84fa7c9665d9bed9aef79237be9c5eb57c49f13d Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期五, 05 三月 2021 10:54:37 +0800 Subject: [PATCH] Merge branch 'CJL' into ez-test --- 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