请合并门锁最新代码【1、优化门锁常开模式推送和增加机械门锁开锁功能；2、优化面板调光目标】

xm

2020-05-20 4e78c9c795dff269ebea37f4e7572d8c8b7d4a69

 ZigbeeApp20200519/Shared/Phone/ZigBee/Device/ZbGateway.cs

old mode 100755
new mode 100644
@@ -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")
                {