合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs

@@ -402,7 +402,7 @@
        /// <summary>

        /// 界面关闭

        /// </summary>

        public override void CloseForm()

        public override void CloseFormBefore()

        {

            ZigBee.Common.Application.IsSearchingGateway = false;

            //停止Wi-Fi配网

@@ -413,7 +413,7 @@
                //刷新主页

                UserView.UserPage.Instance.Fresh();

            }

            base.CloseForm();

            base.CloseFormBefore();

        }



        #endregion