From 7e863a33397f317ffc3ffd9288496d0e4f16aa66 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 14:58:20 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
index dee93fc..d6127f8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
@@ -320,12 +320,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 +335,7 @@
}
//浠庝簯绔笅杞藉浠芥枃浠�
- result = this.DownloadGatewayFile(realGateway, backupId);
+ result = this.DownloadGatewayFile(realGateway, backupId, isAutoBack);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -377,7 +378,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 +420,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 +458,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 +518,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}
};
--
Gitblit v1.8.0