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

xm

2020-05-13 da3634e011bbda29cf4e1c168997b780fe795b20

 ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs

@@ -104,18 +104,25 @@
                            {

                                searchCount = 6;

                                ZbGateway.IsRemote = false;

                                //当网关的连接方式改变时,记录当前的连接方式

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

                            }

                            else

                            {

                                if (searchCount < 0)

                                {

                                    ZbGateway.IsRemote = true;

                                    //当网关的连接方式改变时,记录当前的连接方式

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

                                }

                            }

                        }

                        else

                        {

                            ZbGateway.IsRemote = true;

                            //当网关的连接方式改变时,记录当前的连接方式

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



                            for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
                            {

                                ZbGateway.GateWayList[i].DisConnectLocalMqttClient("1");
@@ -303,48 +310,7 @@
                    try
                    {
                        //定时检测远程连接情况
                        await ZbGateway.StartRemoteMqtt();

                        if (!ZbGateway.IsRemote)
                        {
                            System.Threading.Thread.Sleep(500);
                            continue;
                        }
                        var gateWayList = ZbGateway.GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);

                        if (gateWayList.Count == 1)
                        {
                            gateWayList[0].getGatewayBaseInfo.IsMainGateWay = true;
                        }
                        else
                        {
                            if (gateWayList.Find((obj) => obj.getGatewayBaseInfo.IsMainGateWay) == null)
                            {
                                for (int i = 0; i < gateWayList.Count; i++)
                                {
                                    var gateWay = gateWayList[i];
                                    var info = await gateWay.GetZbGwInfoAsync();
                                    if (info == null || info.getGwData == null)
                                    {
                                        continue;
                                    }
                                    if (info.getGwData.IsDominant == 1)
                                    {

                                        for (int j = 0; j < gateWayList.Count; j++)

                                        {

                                            if (gateWayList[i].getGatewayBaseInfo.gwID == info.getGwData.GwId)

                                            {

                                                gateWayList[i].getGatewayBaseInfo.IsMainGateWay = true;

                                            }

                                            else

                                            {

                                                gateWayList[i].getGatewayBaseInfo.IsMainGateWay = false;

                                            }

                                        }

                                        break;
                                    }
                                }
                            }
                        }
                        await ZbGateway.StartRemoteMqtt();
                    }
                    catch { }
                    System.Threading.Thread.Sleep(2000);