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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 8f0d13f..eb5a27b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -194,7 +194,7 @@
}
break;
//浜轰綋瀛樺湪浼犳劅鍣�
- case SPK.sensorPirhold:
+ case SPK.SensorPirHold:
{
@@ -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);
};
@@ -753,7 +753,7 @@
inputDevice.condition_type = "9";
inputDevice.identifier = this.identifier;
}
- else if (device.spk == SPK.sensorPirhold)
+ else if (device.spk == SPK.SensorPirHold)
{
//浜轰綋瀛樺湪浼犳劅鍣�
inputDevice.hold_time = this.hold_time;
@@ -844,7 +844,7 @@
}
}
break;
- case SPK.sensorPirhold:
+ case SPK.SensorPirHold:
case SPK.SensorDuiShe:
case SPK.SensorShanLan:
case SPK.SensorPir:
@@ -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