From 0087dd7734e71dfcfd1bb54db394ad7855021ffd Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期五, 24 七月 2020 10:18:08 +0800 Subject: [PATCH] 新版本 --- ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs index 726b27a..9539160 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs @@ -292,10 +292,10 @@ private void StartCheckGatewayThread() { this.isGatewaySearching = true; - HdlThreadLogic.Current.RunThread(async () => + HdlThreadLogic.Current.RunThread(() => { //娓呯┖鍏ㄩ儴鍒楄〃 - HdlGatewayLogic.Current.ClearAllRealGateway(); + HdlGatewayLogic.Current.ClearAllRealGatewayConection(true); ZigBee.Common.Application.IsSearchingGateway = true; int count = 0; @@ -311,7 +311,7 @@ } count = 0; - await this.CheckZbGatewayAndSetRow(); + this.CheckZbGatewayAndSetRow(); if (this.newGatewayGetting == true) { @@ -325,7 +325,7 @@ /// <summary> /// 妫�娴嬫悳绱㈠埌鐨勭綉鍏筹紝鐒跺悗娣诲姞鍒扮敾闈㈢殑琛岄噷闈� /// </summary> - private async Task<bool> CheckZbGatewayAndSetRow() + private bool CheckZbGatewayAndSetRow() { List<string> listId = new List<string>(); for (int i = 0; i < ZbGateway.GateWayList.Count; i++) @@ -389,7 +389,7 @@ if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded) { //娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔) - var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO); + var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO); if (result == false) { continue; -- Gitblit v1.8.0