From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs | 88 +++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 41 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
index e07d3bc..cc5bdf5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
@@ -58,29 +58,29 @@
}
//淇濆瓨鍗忚皟鍣ㄧ殑nv鍒嗗尯缁勭綉淇℃伅
- bool result = this.SaveNVFile(realGateway);
- if (result == false)
- {
- //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
- await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return;
- }
+ //bool result = this.SaveNVFile(realGateway);
+ //if (result == false)
+ //{
+ // //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
+ // await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return;
+ //}
//鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
- result = this.OpenZbMsComSend(realGateway);
- if (result == false)
- {
- //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
- await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return;
- }
+ //result = this.OpenZbMsComSend(realGateway);
+ //if (result == false)
+ //{
+ // //濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
+ // await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return;
+ //}
//寮�濮嬩笂浼犳暟鎹�
- result = this.StartUpLoadData(realGateway, backupClassId);
+ bool result = this.StartUpLoadData(realGateway, backupClassId);
if (result == false)
{
//濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
@@ -308,6 +308,8 @@
this.ShowErrorMsg(msg);
return false;
}
+ System.Threading.Thread.Sleep(1000);
+
return success;
}
@@ -320,12 +322,13 @@
/// </summary>
/// <param name="realGateway">鐪熷疄鐗╃悊缃戝叧瀵硅薄</param>
/// <param name="backupId">澶囦唤涓婚敭</param>
- public bool RecoverGateway(ZbGateway realGateway, string backupId)
+ /// <param name="isAutoBack">0:鑾峰彇缃戝叧鎵嬪姩澶囦唤鏂囦欢鍒楄〃 1:鑾峰彇缃戝叧鑷姩澶囦唤鏂囦欢鍒楄〃</param>
+ public bool RecoverGateway(ZbGateway realGateway, string backupId, int isAutoBack)
{
//灞曞紑杩涘害鏉�
ProgressFormBar.Current.Start();
//浠庝簯绔幏鍙栧浠芥枃浠跺垪琛�
- var result = this.GetGatewayFileList(realGateway, backupId);
+ var result = this.GetGatewayFileList(realGateway, backupId, isAutoBack);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -334,7 +337,7 @@
}
//浠庝簯绔笅杞藉浠芥枃浠�
- result = this.DownloadGatewayFile(realGateway, backupId);
+ result = this.DownloadGatewayFile(realGateway, backupId, isAutoBack);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -342,23 +345,23 @@
return false;
}
- //鎭㈠鍗忚皟鍣╪v鍒嗗尯鐨勭粍缃戜俊鎭�
- result = this.RestoreGatewayNV(realGateway);
- if (result == false)
- {
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return false;
- }
+ ////鎭㈠鍗忚皟鍣╪v鍒嗗尯鐨勭粍缃戜俊鎭�
+ //result = this.RestoreGatewayNV(realGateway);
+ //if (result == false)
+ //{
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return false;
+ //}
//鎵撳紑鍗忚皟鍣ㄤ覆鍙ｅ彂閫佸姛鑳�
- result = this.OpenZbMsComSend(realGateway);
- if (result == false)
- {
- //鍏抽棴杩涘害鏉�
- ProgressFormBar.Current.Close();
- return false;
- }
+ //result = this.OpenZbMsComSend(realGateway);
+ //if (result == false)
+ //{
+ // //鍏抽棴杩涘害鏉�
+ // ProgressFormBar.Current.Close();
+ // return false;
+ //}
//閲嶅惎缃戝叧绯荤粺
result = this.GatewayReboot(realGateway);
@@ -377,7 +380,7 @@
/// <param name="realGateway"></param>
/// <param name="backupClassId"></param>
/// <returns></returns>
- private bool GetGatewayFileList(ZbGateway realGateway, string backupClassId)
+ private bool GetGatewayFileList(ZbGateway realGateway, string backupClassId, int isAutoBack)
{
//姝ｅ湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileListGetting));
@@ -419,7 +422,7 @@
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 6202 } };
var data = new Newtonsoft.Json.Linq.JObject {
{ "url", fullUrl }, { "RequestVersion", Common.CommonPage.RequestVersion },
- { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", 0 },
+ { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", isAutoBack },
{ "BackupClassId", backupClassId },{ "GatewayUniqueId",HdlGatewayLogic.Current.GetGatewayId(realGateway)},
{ "IsOtherAccountCtrl",connectMode == HttpConnectMode.Admin?1:0}
};
@@ -457,7 +460,7 @@
/// <param name="realGateway"></param>
/// <param name="backupClassId"></param>
/// <returns></returns>
- private bool DownloadGatewayFile(ZbGateway realGateway, string backupClassId)
+ private bool DownloadGatewayFile(ZbGateway realGateway, string backupClassId, int isAutoBack)
{
//姝ｅ湪涓嬭浇澶囦唤鏂囦欢
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileDownloading));
@@ -517,7 +520,7 @@
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 6203 } };
var data = new Newtonsoft.Json.Linq.JObject {
{ "url", fullUrl }, { "RequestVersion", Common.CommonPage.RequestVersion },
- { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", 0 },
+ { "LoginAccessToken", UserCenterLogic.GetConnectMainToken() }, { "IsGatewayAutoBackup", isAutoBack },
{ "BackupClassId", backupClassId },{ "GatewayUniqueId",HdlGatewayLogic.Current.GetGatewayId(realGateway)},
{ "IsOtherAccountCtrl",connectMode == HttpConnectMode.Admin?1:0}
};
@@ -685,6 +688,9 @@
}
if (gatewatAction == true)
{
+ //璁剧疆杩涘害鍊�:100%
+ ProgressFormBar.Current.SetValue(1, 1);
+ System.Threading.Thread.Sleep(1000);
//缃戝叧鏁版嵁鎭㈠鎴愬姛!
string msg = Language.StringByID(R.MyInternationalizationString.uRestoreGatewayDataSuccess);
this.ShowTipMsg(msg);
--
Gitblit v1.8.0