From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
index c7706df..c39db25 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
@@ -40,16 +40,16 @@
/// </summary>
/// <param name="realGateway">鐪熷疄鐗╃悊缃戝叧瀵硅薄</param>
/// <param name="backupName">闇�瑕佸垱寤虹殑澶囦唤鐨勫悕瀛�</param>
- public async void DoBackupGateway(ZbGateway realGateway, string backupName)
+ public void DoBackupGateway(ZbGateway realGateway, string backupName)
{
//灞曞紑杩涘害鏉�
ProgressFormBar.Current.Start();
//鍒涘缓澶囦唤鏂囦欢
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uCreatBackupFile));
- await System.Threading.Tasks.Task.Delay(1000);
+ System.Threading.Thread.Sleep(1000);
//鍒涘缓涓�涓浠藉悕瀛�
- string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(backupName, 2, realGateway.GwId);
+ string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backupName, 2, realGateway.GwId);
if (backupClassId == null)
{
//鍏抽棴杩涘害鏉�
@@ -84,7 +84,7 @@
if (result == false)
{
//濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
- await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
+ HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
//鍏抽棴杩涘害鏉�
ProgressFormBar.Current.Close();
return;
@@ -653,7 +653,7 @@
//缃戝叧宸茬粡鎺ユ敹鍒伴噸鍚懡浠�,鎺ヤ笅鏉ュ幓鍒ゆ柇缃戝叧鏄惁閲嶅惎瀹屾垚
bool gatewatAction = false;
bool threadAction = true;
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
timeOut = 0;
while (gatewatAction == false)
@@ -662,7 +662,7 @@
if (timeOut >= 65 && timeOut % 5 == 0)
{
//5绉掍竴娆�,鍘昏幏鍙栫増鏈�
- var data = await HdlGatewayLogic.Current.GetGatewayNewInfoAsync(realGateway, ShowErrorMode.NO);
+ var data = HdlGatewayLogic.Current.GetGatewayInfo(realGateway, ShowErrorMode.NO);
if (data != null)
{
gatewatAction = true;
@@ -670,7 +670,7 @@
break;
}
}
- await System.Threading.Tasks.Task.Delay(1000);
+ System.Threading.Thread.Sleep(1000);
timeOut++;
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(timeOut, 180);
--
Gitblit v1.8.0