From da3634e011bbda29cf4e1c168997b780fe795b20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 09:05:23 +0800
Subject: [PATCH] 优化新风模块和新风面板的测试功能，请合并代码
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 78c77e8..a893a4a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -13,7 +13,7 @@
/// </summary>
/// <param name="common">Common.</param>
/// <param name="objecttype">Objecttype.</param>
- public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
+ public static void AddDeviceconditions(CommonDevice common, Dictionary<string, string> objecttype)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
{
@@ -126,7 +126,7 @@
/// </summary>
/// <param name="common">Common.</param>
/// <param name="actionsInfo">Objecttype.</param>
- public static void AddDeviceactions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
+ public static void AddDeviceActions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
{
@@ -143,6 +143,27 @@
Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
}
/// <summary>
+ /// 娣诲姞闂ㄩ攣璁惧杈撳嚭鐨勬柟娉�
+ /// </summary>
+ /// <param name="common">Common.</param>
+ /// <param name="actionsInfo">Objecttype.</param>
+ public static void AddDoorLockActions(ZigBee.Device.CommonDevice common, Dictionary<string, object> actionsInfo)
+ {
+ for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
+ {
+ if (Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString() == "8")
+ {
+ if (Common.Logic.CurrentLogic.Actions[i]["DeviceAddr"].ToString() == common.DeviceAddr && Common.Logic.CurrentLogic.Actions[i]["Epoint"].ToString() =="200")
+ {
+ Common.Logic.CurrentLogic.Actions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Actions.Insert(i, actionsInfo);
+ return;
+ }
+ }
+ }
+ Common.Logic.CurrentLogic.Actions.Add(actionsInfo);
+ }
+ /// <summary>
/// 娣诲姞Scene杈撳嚭鐨勬柟娉�
/// </summary>
/// <param name="Scene">Common.</param>
--
Gitblit v1.8.0