安川

黄学彪

2020-05-09 21736b2944d5e88cd705a39ff87fd73d5a16e609

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

@@ -2702,7 +2702,6 @@
                            {

                                DebugPrintLog($" 本地连接成功_网关IP:{brokerName}_网关是否加:{IsEncry}_当前密码:{Password}");

                                IsRemote = false;

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

                            });
                        }



@@ -2943,7 +2942,7 @@
                                await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze");



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



                                //没有主网关时主动读取，获取主网关信息

                                var gateWayList = GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);

                                if (gateWayList.Find(obj => obj.getGatewayBaseInfo.IsMainGateWay == true) == null)

@@ -3111,7 +3110,8 @@
                    await RemoteMqttClient.DisconnectAsync();

                }

            }

            catch(Exception e) { 
            catch (Exception e)

            {
                DebugPrintLog($"Remote断开通讯连接出异常:{e.Message}");

            }

        }
@@ -3336,7 +3336,8 @@
                {
                    return;
                }
                if (topics[2]== "NotifyGateWayInfoChange") {
                if (topics[2] == "NotifyGateWayInfoChange")
                {
                    initGateWayBaseInfomation();
                    return;
                }