Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -3317,10 +3317,7 @@
                        DefaultCommunicationTimeout = new TimeSpan(0, 0, 100),//设置超时时间
                    };
                    //远程通讯连接，连接云端服务器 
                    if (RemoteMqttClient != null)

                    {

                        await RemoteMqttClient.ConnectAsync(connectCloudMqttClientOptions);

                    }
                    await RemoteMqttClient.ConnectAsync(connectCloudMqttClientOptions);

                }
                catch (Exception ex)