???????

黄学彪

2020-04-15 23532fa8ad34c89b6d24b01eaef6475fd0aad898

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

@@ -3130,14 +3130,14 @@
                            {

                                if (localMqttClient.Options == null)

                                {

                                    var options = new MQTTnet.Client.Options.MqttClientOptionsBuilder().WithClientId(currentGuid.ToString())

                       .WithTcpServer(brokerName, 1883)

                       .WithKeepAlivePeriod(TimeSpan.FromSeconds(20))

                       .WithCleanSession()

                        //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))

                       .WithCredentials("", "")

                       .Build();

                                    await localMqttClient.ConnectAsync(options, CancellationToken.None);

                                    var options = new MQTTnet.Client.Options.MqttClientOptionsBuilder()//MQTT连接参数填充

                                    .WithClientId(currentGuid.ToString())//客户端ID

                                    .WithTcpServer(brokerName, 1883)//TCP服务端  1883  ，即MQTT服务端

                                    .WithCredentials("", "")//"", "")//凭证  帐号 密码

                                    .WithCommunicationTimeout(new TimeSpan(0, 0, 60)) //重连超时时间，默认5s

                                    .WithKeepAlivePeriod(new TimeSpan(0, 0, 15)) //保持连接时间，默认5s，心跳包

                                    .Build();//

                                    await localMqttClient.ConnectAsync(options);

                                }

                                else

                                {

@@ -3313,7 +3313,8 @@
                                //这里是特殊的主题

                                if (e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze"//踢人下线

                                   || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/Deleted"//分享删除

                                   || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/DeletedShareData"

                                   || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/DeletedShareData"//分享删除

                                   || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/Update"//成员权限变更

                                   || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Home.Id + "_" + Config.Instance.Guid + "/PrimaryUserDelYou")//子账号被删除

                                {

                                    mqttRemoteClient_MqttMsgPublishReceived(e);

@@ -3351,6 +3352,8 @@
                                    await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/DeletedShareData");

                                    //订阅一个子账号被删除的主题

                                    await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.Home.Id + "_" + myGuid + "/PrimaryUserDelYou");

                                    //订阅一个成员权限已经变更的主题

                                    await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/Update");

                                }

                                //订阅一个挤下线的主题

                                await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze");