优化新风模块和新风面板的测试功能，请合并代码

xm

2020-05-13 da3634e011bbda29cf4e1c168997b780fe795b20

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

old mode 100644
new mode 100755
@@ -101,7 +101,7 @@
            }
        }

        #region variable
        #region variable 
        /// <summary>
        /// 远程连接成功时的时间
        /// </summary>
@@ -2702,7 +2702,6 @@
                            {

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

                                IsRemote = false;

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

                            });
                        }



@@ -2857,8 +2856,8 @@
        /// <summary>
        /// 远程MqttClient
        /// </summary>
        public static IMqttClient RemoteMqttClient = new MqttFactory().CreateMqttClient();
        static bool remoteIsConnected;
        public static IMqttClient RemoteMqttClient= new MqttFactory().CreateMqttClient();
        static bool remoteIsConnected; 
        private int IsLogin = 0;
        [Newtonsoft.Json.JsonIgnore]
        static Action actionTemp;
@@ -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)

@@ -3051,8 +3050,8 @@
           .WithTcpServer(domain, int.Parse(port))

           .WithCredentials(connEmqUserName, connEmqPwd)

           .WithKeepAlivePeriod(TimeSpan.FromSeconds(20))

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

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

           .Build();

                                await DisConnectRemoteMqttClient("StartRemoteMqtt");

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

@@ -3087,7 +3086,7 @@
                    localIsConnected = false;

                    DebugPrintLog($"Local主动断开_{s}");

                    //await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions {  }, CancellationToken.None);

                    await localMqttClient.DisconnectAsync();
                    await localMqttClient.DisconnectAsync(); 
                }

            }
            catch (Exception ex)
@@ -3099,7 +3098,7 @@
        /// <summary>

        /// 断开远程Mqtt的链接

        /// </summary>
        public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s = "")

        public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s="")

        {

            try

            {

@@ -3218,7 +3217,7 @@
                        {

                            await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });

                        }

                        catch (Exception e)

                        catch(Exception e)

                        {
                            DebugPrintLog($"Local主动断开_{e.Message}");

                            await DisConnectLocalMqttClient(e.Message);
@@ -3424,7 +3423,7 @@
        /// <param name="topic">Topic.</param>
        /// <param name="message">Message.</param>
        /// <param name="e">E.</param>
        static void ReceiveMessage(string topic, string message, byte[] payload)
        static void ReceiveMessage(string topic, string message, byte []payload)
        {
            try
            {