From f5ba05c33393e55de28db91433901600bfb0658f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 五月 2020 17:43:11 +0800
Subject: [PATCH] 请合并最新代码「20200522:添加门锁晚上9点上报常开功能，优化PM2.5测试功能」
---
ZigbeeApp20200519/Shared/Phone/ZigBee/Device/ZbGateway.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp20200519/Shared/Phone/ZigBee/Device/ZbGateway.cs
old mode 100755
new mode 100644
index f8b36df..01c654c
--- a/ZigbeeApp20200519/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp20200519/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -2758,8 +2758,8 @@
.WithTcpServer(domain, int.Parse(port))
.WithCredentials(connEmqUserName, connEmqPwd)
.WithKeepAlivePeriod(TimeSpan.FromSeconds(20))
- .WithCleanSession()
- //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
+ .WithCleanSession()
+ //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
.Build();
await DisConnectRemoteMqttClient("StartRemoteMqtt");
await RemoteMqttClient.ConnectAsync(options, CancellationToken.None);
@@ -3230,6 +3230,7 @@
UpdateDeviceInfo(tempDevice, "DeviceStatusReport");
}
#endregion
+
#region 闂ㄩ攣鎿嶄綔浜嬩欢閫氱煡
else if (topic == gatewayID + "/" + "DoorLock/DoorLockOperatingEventNotificationCommand")
{
@@ -3253,6 +3254,7 @@
}
}
#endregion
+
#region 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
else if (topic == gatewayID + "/" + "DoorLock/DoorLockProgrammingEventNotificationCommand")
{
--
Gitblit v1.8.0