Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs

@@ -2228,13 +2228,13 @@
                    waitCount++;

                    if (this.nowGwConnectMode == GatewayConnectMode.Remote)

                    {

                        //远程每10秒检测一次

                        if (waitCount < 10) { continue; }

                        //远程每20秒检测一次

                        if (waitCount < 20) { continue; }

                    }

                    else if (this.nowGwConnectMode == GatewayConnectMode.WIFI)

                    {

                        //局域网每3秒检测一次

                        if (waitCount < 3) { continue; }

                        //局域网每5秒检测一次

                        if (waitCount < 5) { continue; }

                    }

                    waitCount = 0;