删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

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

@@ -3362,7 +3362,21 @@
                            {
                                if (!RemoteMqttClient.IsConnected || !IsRemote)
                                {
                                    return;
                                    if (e.ApplicationMessage.Topic != "/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze")

                                    {

                                        return;

                                    }
                                }

                                //如果当前使用的是内网模式

                                if (IsRemote == false)

                                {

                                    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")

                                    {

                                        mqttRemoteClient_MqttMsgPublishReceived(e);

                                    }

                                    return;

                                }
                                mqttRemoteClient_MqttMsgPublishReceived(e);
                            });
@@ -3391,6 +3405,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);

@@ -3446,7 +3462,9 @@
                                ["RequestVersion"] = CommonPage.RequestVersion,

                                ["RequestSource"] = 0,

                                ["LoginAccessToken"] = Config.Instance.Token,

                                ["RequestProtocolType"] = 0

                                ["RequestProtocolType"] = 0,

                                ["PlatformStr"] = "h",//这两个值如果不设置,则云端不发布主题

                                ["PublishPayloadJsonStr"] = "1"

                            };

                            var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));

                            result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);

@@ -3461,7 +3479,9 @@
                                ["LoginAccessToken"] = Config.Instance.Token,

                                ["RequestProtocolType"] = 0,

                                ["MainUserDistributedMark"] = Config.Instance.Home.MainUserDistributedMark,

                                ["HomeId"] = Config.Instance.Home.Id

                                ["HomeId"] = Config.Instance.Home.Id,

                                ["PlatformStr"] = "h",//这两个值如果不设置,则云端不发布主题

                                ["PublishPayloadJsonStr"] = "1"

                            };

                            var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));

                            result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/ShareMemberConnMqttInfo", bytes, Config.Instance.Token);

@@ -3482,6 +3502,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];
@@ -3884,7 +3906,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)
@@ -3916,9 +3941,6 @@
                {
                    jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
                }



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

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



                #region 远程,主网关上报通知
                if (IsRemote)