From 45e4e387f3ef259b9e225fdd543e20be285a5112 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期二, 29 十月 2019 13:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
old mode 100644
new mode 100755
index 59e67bb..2c08e7a
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -1371,7 +1371,7 @@
case DeviceType.DoorLock:
{
#region ------
- var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
+ var doorlockifonlist = Send.ReadDoorLockIfon(common.DeviceAddr);
//var list = Send.ReadDoorLockIfon(common.DeviceAddr);
var pra = new UserCenter.MemberListInfoPra();
string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
@@ -1540,7 +1540,7 @@
deviceConditionsInfo.Add(Key, Value);
}
-
+
}
}
--
Gitblit v1.8.0