From edfb48fa10b0518311ee46bef4aded0859069d16 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期二, 18 七月 2023 17:51:52 +0800 Subject: [PATCH] 2023年07月18日17:50:46 --- HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs index 32a9a61..eb5a27b 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs @@ -215,12 +215,12 @@ view2.btnClick.MouseUpEventHandler += (sender, e) => { //涓荤晫闈㈡帶浠� - FrameLayout fLayout = new FrameLayout + FrameLayout fLayout2 = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence, }; - this.AddChidren(fLayout); - TimeView(fLayout, device, view2.btnState); + this.AddChidren(fLayout2); + TimeView(fLayout2, device, view2.btnState); }; @@ -1405,7 +1405,7 @@ string value = dic["value"]; if (dictionaryA["key"] == key && dictionaryA["comparator"] == comparatorValue) { - if (this.checkSpk()) + if (this.CheckSpk()) { //鏈変簺璁惧闇�瑕佸鍔犺繖涓垽鏂� if (dictionaryA["value"] == value) @@ -1429,7 +1429,7 @@ /// 妫�鏌ユ槸鍚︽敮鎸� /// </summary> /// <returns></returns> - private bool checkSpk() + private bool CheckSpk() { if (this.function.spk == SPK.VideoDoorLock || this.function.spk == SPK.doorgate @@ -1439,7 +1439,7 @@ } return false; - } + } /// <summary> /// 鍒ゆ柇dictionaryB鏄惁瀹屾暣鍖呭惈鍙︿竴涓猟ictionaryA /// </summary> -- Gitblit v1.8.0