From 2ec9898778d3beda89278e2a53ac0e68b3035d29 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:06:24 +0800
Subject: [PATCH] 2020-7-1-2
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index df45fc1..fd74126 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -41,7 +41,8 @@
}
}
- else if (common.Type == DeviceType.IASZone) {
+ else if (common.Type == DeviceType.IASZone)
+ {
var iASZonedevice = common as IASZone;
if (iASZonedevice.IasDeviceType == 541)
{//鐞冨舰绉诲姩浼犳劅鍣�
@@ -51,7 +52,13 @@
Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
return;
}
+ continue;
}
+
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
+
}
else
{
@@ -199,8 +206,7 @@
/// <summary>
/// 娣诲姞瀹夐槻杈撳嚭鐨勬柟娉�
/// </summary>
- /// <param name="objecttype">Objecttype.</param>
- /// <param name="o">O.</param>
+ /// <param name="actionsInfo">actionsInfo.</param>
public static void AddSecurityactions(Dictionary<string, object> actionsInfo)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
@@ -218,8 +224,8 @@
/// <summary>
/// 娣诲姞鑷姩鍖栬緭鍑虹殑鏂规硶
/// </summary>
- /// <param name="objecttype">Objecttype.</param>
- /// <param name="o">O.</param>
+ /// <param name="actionsInfo">Objecttype.</param>
+ /// <param name="logic">logic</param>
public static void AddLogicactions(Common.Logic logic, Dictionary<string, object> actionsInfo)
{
--
Gitblit v1.8.0