Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs

@@ -379,7 +379,7 @@
            }

            oldGetOnlineTime = DateTime.Now;



            new System.Threading.Thread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                System.Threading.Thread.Sleep(300);

                //刷新网关在线状态

@@ -395,8 +395,7 @@
                }

                //网关新版本检测

                this.CheckGatewayNewVersion(listway);

            })

            { IsBackground = true }.Start();

            });

        }



        /// <summary>

@@ -492,10 +491,11 @@
        /// <summary>

        /// 自身的上层界面关闭后,它自身处于最上层时,触发的事件

        /// </summary>

        public override void FormActionAgainEvent()

        public override int FormActionAgainEvent()

        {

            //初始化中部控件

            this.InitMiddleFrame();

            return 1;

        }



        #endregion