From 16604a593202f2f87adf71abd57d036fe7da3b52 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 10:39:42 +0800
Subject: [PATCH] 同步了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 95 ++++++++---------------------------------------
1 files changed, 16 insertions(+), 79 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 2a2ea96..334034f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -87,6 +87,9 @@
/// </summary>
private async void SetBackupInfoToForm()
{
+ this.nowSelectBackId = string.Empty;
+ this.nowbtnSelect = null;
+
//杩涘害鏉�
this.ShowProgressBar();
@@ -128,7 +131,19 @@
string msg = Language.StringByID(R.MyInternationalizationString.uDownLoadAndRecoverMsg);
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- this.LoadBackupInfo(this.nowSelectBackId);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //璇诲彇澶囦唤鏂囨。
+ bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId);
+ if (result == true)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴杩欎釜鐣岄潰
+ this.CloseForm();
+ });
+ }
+ });
});
};
//璋冩暣鐪熷疄楂樺害
@@ -220,46 +235,6 @@
#endregion
- #region 鈻� 璇诲彇澶囦唤鏂囨。_______________________
-
- /// <summary>
- /// 璇诲彇澶囦唤鏂囨。
- /// </summary>
- /// <param name="BackupClassId"></param>
- private void LoadBackupInfo(string BackupClassId)
- {
- HdlThreadLogic.Current.RunThread(async () =>
- {
- //鑾峰彇缃戝叧涓婇潰瀛樺湪鐨勫叏閮ㄦ枃浠�
- var listFile = await this.GetGatewayFileFromGateway();
- if (listFile == null)
- {
- return;
- }
- //浠庝簯绔幏鍙栧浠界殑鏂囦欢
- bool result = await HdlBackupLogic.Current.LoadGatewayBackupInfo(BackupClassId, realGateway, listFile);
- if (result == false)
- {
- //缃戝叧鎭㈠澶辫触
- string msg2 = Language.StringByID(R.MyInternationalizationString.uGatewayFileRecoverFail);
- this.ShowMassage(ShowMsgType.Error, msg2);
- return;
- }
-
- HdlThreadLogic.Current.RunMain(() =>
- {
- //鍏抽棴鑷韩
- this.CloseForm();
- });
-
- //缃戝叧鎭㈠鎴愬姛
- string msg = Language.StringByID(R.MyInternationalizationString.uGatewayFileRecoverSuccess);
- this.ShowMassage(ShowMsgType.Normal, msg);
- });
- }
-
- #endregion
-
#region 鈻� 缂栬緫澶囦唤鍚嶇О_______________________
/// <summary>
@@ -341,44 +316,6 @@
}
});
}
-
- #endregion
-
- #region 鈻� 鑾峰彇缃戝叧鏂囦欢_______________________
-
- /// <summary>
- /// 浠庣綉鍏宠幏鍙栧畠鐨勬枃浠�
- /// </summary>
- /// <returns></returns>
- private async System.Threading.Tasks.Task<List<string>> GetGatewayFileFromGateway()
- {
- var fileData = await realGateway.FileTransferLsDirAsync();
- //妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
- string error = HdlCheckLogic.Current.CheckCommonErrorCode(fileData);
- if (error != null)
- {
- this.ShowMassage(ShowMsgType.Error, error);
- return null;
- }
-
- if (fileData == null || fileData.fileTransferLsDiResponseData == null || fileData.fileTransferLsDiResponseData.Result != 0)
- {
- //鑾峰彇缃戝叧鏂囦欢澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayFileFail);
- this.ShowMassage(ShowMsgType.Error, msg);
- return null;
- }
- var listFile = new List<string>();
- foreach (var filedata in fileData.fileTransferLsDiResponseData.Dir)
- {
- listFile.Add(filedata.File);
- }
- return listFile;
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
#endregion
}
--
Gitblit v1.8.0