合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -707,7 +707,7 @@
            //移除
            ZbGateway.GateWayList.RemoveAll((obj) => this.GetGatewayId(obj) == zbGatewayID);
            //断开mqtt连接
            realWay.DisConnect("GD");
            realWay.DisConnectLocalMqttClient("GD");

            return true;
        }

@@ -1556,7 +1556,7 @@
            //最后再断开mqtt连接

            for (int i = 0; i < list.Count; i++)

            {

                list[i].DisConnect("G");

                list[i].DisConnectLocalMqttClient("G");

            }

            list.Clear();

        }