不是新代码，别 合并

黄学彪

2020-08-07 ec34983e291d1c85284472a27109d55891f9a6b5

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

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

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        this.DeleteGateway(strWayId, gatewayRow);

                        this.DeleteGateway(strWayId);

                    });

                });

            };

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

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

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

        private async void DeleteGateway(string strWayId, GatewayRowControl row)

        private void DeleteGateway(string strWayId)

        {

            //打开进度条

            this.ShowProgressBar();

            //删除云端网关

            bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);

            bool result = HdlGatewayLogic.Current.DeleteGateway(strWayId);

            //关闭进度条

            this.CloseProgressBar();

            if (result == false)

@@ -273,9 +273,9 @@
        /// </summary>

        /// <param name="gatewayId"></param>

        /// <param name="online"></param>

        private async void DoSwitchGateway(string gatewayId)

        private void DoSwitchGateway(string gatewayId)

        {

            var result = await HdlGatewayLogic.Current.DoSwitchGateway(gatewayId);

            var result = HdlGatewayLogic.Current.DoSwitchGateway(gatewayId);

            if (result == false)

            {

                return;

@@ -354,7 +354,7 @@
        /// <param name="hadGwOnline">2020.05.25追加:此住宅是否拥有网关在线</param>

        public override void GatewayOnlinePush(ZbGateway gateWay, bool online, bool hadGwOnline)

        {

            Application.RunOnMainThread(() =>

            HdlThreadLogic.Current.RunMain(() =>

            {

                if (this.Parent == null)

                {

@@ -365,7 +365,7 @@
                {

                    this.dicRowContr[gwid].IsOnline = online;

                }

            });

            }, ShowErrorMode.NO);

        }



        #endregion

@@ -376,7 +376,7 @@
        /// 网关新版本检测

        /// </summary>

        /// <param name="listWays"></param>

        private async void CheckGatewayNewVersion(List<ZbGateway> listWays)

        private void CheckGatewayNewVersion(List<ZbGateway> listWays)

        {

            foreach (var way in listWays)

            {

@@ -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)

                        {