blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
gxc
2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af 
 ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs


@@ -3392,6 +3392,8 @@


                                    //订阅一个分享数据已经变更的主题



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



                                }



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



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







                                await initGateWayBaseInfomation();


                                Shared.Phone.UserCenter.HdlGatewayLogic.Current.CheckGatewayByConnectChanged(Shared.Phone.UserCenter.GatewayConnectMode.Remote);



@@ -3483,6 +3485,8 @@


                                var connEmqClientId = responseData["ConnEmqClientId"]?.ToString();


                                var connEmqUserName = responseData["ConnEmqUserName"]?.ToString();


                                var connEmqPwd = responseData["ConnEmqPwd"]?.ToString();


                                //记录起当前的客户端ID


                                Config.Instance.ConnEmqClientId = connEmqClientId;




                                var connEmqDomainPorts = connEmqDomainPort.Replace("//", "").Split(':');


                                var domain = connEmqDomainPorts[1];


@@ -3885,7 +3889,10 @@


                    epoint = topic.Split('/')[3];


                    cluID = topic.Split('/')[4];


                    attrId = topic.Split('/')[5];


                }


                }







                //全局接收网关推送的的逻辑(为了执行速度,尽可能的别加耗时的操作)



                Shared.Phone.UserCenter.HdlGatewayReceiveLogic.Current.GatewayOverallMsgReceive(gatewayID, topic, reportStatus, message);




                var gwa = GateWayList.Find(obj => obj.getGatewayBaseInfo.gwID == gatewayID);


                if (gwa == null)


@@ -3917,9 +3924,6 @@


                {


                    jobject = Newtonsoft.Json.Linq.JObject.Parse(message);


                }







                //全局接收网关推送的的逻辑(为了执行速度,尽可能的别加耗时的操作)



                Shared.Phone.UserCenter.HdlGatewayReceiveLogic.Current.GatewayOverallMsgReceive(gatewayID, topic, reportStatus, jobject);







                #region 远程,主网关上报通知


                if (IsRemote)