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

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -206,7 +206,7 @@
                {

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        this.DeleteGateway(strWayId, gatewayRow);

                        this.DeleteGateway(strWayId);

                    });

                });

            };

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

        /// <param name="strWayId"></param>

        /// <param name="row"></param>

        private async void DeleteGateway(string strWayId, GatewayRowControl row)

        private async void DeleteGateway(string strWayId)

        {

            //打开进度条

            this.ShowProgressBar();

@@ -390,7 +390,7 @@
                    continue;

                }

                //获取最新版本

                var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(way, ShowErrorMode.NO);

                var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(way, ShowErrorMode.NO);

                if (result == null)

                {

                    continue;

@@ -399,7 +399,7 @@
                {

                    //有新版本

                    string gwid = way.GwId;

                    Application.RunOnMainThread(() =>

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (this.dicRowContr.ContainsKey(gwid) == true && this.dicRowContr[gwid] != null)

                        {