合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

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

@@ -3517,7 +3517,8 @@
                {

                    localIsConnected = false;

                    DebugPrintLog($"Local主动断开_{s}");

                    await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions {  }, CancellationToken.None);

                    //await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions {  }, CancellationToken.None);

                    await localMqttClient.DisconnectAsync(); 
                }

            }
            catch (Exception ex)
@@ -3537,7 +3538,8 @@
                {

                    remoteIsConnected = false;

                    DebugPrintLog($"Remote主动断开_{s}");

                    await RemoteMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);

                    //await RemoteMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);

                    await RemoteMqttClient.DisconnectAsync();

                }

            }

            catch(Exception e) { 

@@ -4365,7 +4367,6 @@
                    }
                }
                #endregion
                DebugPrintLog("网关返回数据通知");
            }
            catch (Exception ex)
            {