From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 317 +++++++++++++++++++++++-----------------------------
1 files changed, 142 insertions(+), 175 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 2a2ea96..505b884 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -85,57 +85,91 @@
/// <summary>
/// 浠庝簯绔幏鍙栨暟鎹�
/// </summary>
- private async void SetBackupInfoToForm()
+ private void SetBackupInfoToForm()
{
- //杩涘害鏉�
- this.ShowProgressBar();
+ this.nowSelectBackId = string.Empty;
+ this.nowbtnSelect = null;
- //浠庝簯绔幏鍙栨暟鎹�
- var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(2, HdlGatewayLogic.Current.GetGatewayId(realGateway));
- if (pageData == null)
- {
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar(ShowReLoadMode.YES);
- return;
- }
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
+ //鈽嗐優銉笺偗鈽�
+ ////杩涘害鏉�
+ //this.ShowProgressBar();
- HdlThreadLogic.Current.RunMain(() =>
- {
- listView.RemoveAll();
- listView.RecoverHeight();
- for (int i = 0; i < pageData.Count; i++)
- {
- //娣诲姞澶囦唤琛�
- this.AddRowlayout(pageData[i], i != pageData.Count - 1);
- }
+ ////鑾峰彇鑷姩澶囦唤鐨勬暟鎹�
+ //var pageAuto = HdlBackupLogic.Current.GetBackupListNameFromDB(3, realGateway.GwId);
+ //if (pageAuto == null)
+ //{
+ // //鍏抽棴杩涘害鏉�
+ // this.CloseProgressBar(ShowReLoadMode.YES);
+ // return;
+ //}
- this.btnDownload?.RemoveFromParent();
- if (pageData.Count > 0)
- {
- //涓嬭浇
- this.btnDownload = new BottomClickButton();
- btnDownload.TextID = R.MyInternationalizationString.uDownLoad;
- bodyFrameLayout.AddChidren(btnDownload);
- btnDownload.ButtonClickEvent += (sender, e) =>
- {
- if (this.nowSelectBackId == string.Empty)
- {
- return;
- }
- //鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛�
- string msg = Language.StringByID(R.MyInternationalizationString.uDownLoadAndRecoverMsg);
- this.ShowMassage(ShowMsgType.Confirm, msg, () =>
- {
- this.LoadBackupInfo(this.nowSelectBackId);
- });
- };
- //璋冩暣鐪熷疄楂樺害
- listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
- }
+ ////浠庝簯绔幏鍙栨暟鎹�
+ //var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);
+ //if (pageData == null)
+ //{
+ // //鍏抽棴杩涘害鏉�
+ // this.CloseProgressBar(ShowReLoadMode.YES);
+ // return;
+ //}
+ ////鍏抽棴杩涘害鏉�
+ //this.CloseProgressBar();
- });
+ //HdlThreadLogic.Current.RunMain(() =>
+ //{
+ // listView.RemoveAll();
+ // listView.RecoverHeight();
+
+ // //鑷姩澶囦唤鐨処D
+ // string autoID = string.Empty;
+ // if (pageAuto.Count > 0)
+ // {
+ // autoID = pageAuto[0].Id;
+ // //娣诲姞鑷姩澶囦唤琛�
+ // this.AddRowlayout(pageAuto[0], pageData.Count > 0, true);
+ // }
+
+ // for (int i = 0; i < pageData.Count; i++)
+ // {
+ // //娣诲姞澶囦唤琛�
+ // this.AddRowlayout(pageData[i], i != pageData.Count - 1, false);
+ // }
+
+ // this.btnDownload?.RemoveFromParent();
+ // if (pageData.Count > 0 || pageAuto.Count > 0)
+ // {
+ // //涓嬭浇
+ // this.btnDownload = new BottomClickButton();
+ // btnDownload.TextID = R.MyInternationalizationString.uDownLoad;
+ // bodyFrameLayout.AddChidren(btnDownload);
+ // btnDownload.ButtonClickEvent += (sender, e) =>
+ // {
+ // if (this.nowSelectBackId == string.Empty)
+ // {
+ // return;
+ // }
+ // //鏄惁瑕佷笅杞藉苟鎭㈠鏁版嵁锛�
+ // string msg = Language.StringByID(R.MyInternationalizationString.uDownLoadAndRecoverMsg);
+ // this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ // {
+ // HdlThreadLogic.Current.RunThread(() =>
+ // {
+ // //璇诲彇澶囦唤鏂囨。
+ // bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);
+ // if (result == true)
+ // {
+ // HdlThreadLogic.Current.RunMain(() =>
+ // {
+ // //鍏抽棴杩欎釜鐣岄潰
+ // this.CloseForm();
+ // });
+ // }
+ // });
+ // });
+ // };
+ // //璋冩暣鐪熷疄楂樺害
+ // listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
+ // }
+ //});
}
#endregion
@@ -147,25 +181,24 @@
/// </summary>
/// <param name="fileInfo"></param>
/// <param name="addLine"></param>
- private void AddRowlayout(BackupListNameInfo fileInfo, bool addLine)
+ /// <param name="isAuto"></param>
+ private void AddRowlayout(BackupListNameInfo fileInfo, bool addLine, bool isAuto)
{
var rowLayout = new RowLayoutControl(listView.rowSpace / 2);
listView.AddChidren(rowLayout);
//澶囦唤鍚嶅瓧
- var txtText = rowLayout.frameTable.AddLeftCaption(fileInfo.BackupName, 700, 60);
- txtText.TextSize = 15;
- txtText.Y = Application.GetRealHeight(12) + rowLayout.chidrenYaxis;
- rowLayout.frameTable.AddChidren(txtText, ChidrenBindMode.BindEventOnly);
- //鏃堕棿 2019-11-11T11:31:01
- var btnTime = rowLayout.frameTable.AddLeftCaption("", 600, 50, true);
- btnTime.Y = Application.GetRealHeight(72) + rowLayout.chidrenYaxis;
- btnTime.TextSize = 12;
- btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;
- rowLayout.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEventOnly);
- if (fileInfo.CreatedOnUtc.Length >= 19)
+ var txtText = rowLayout.frameTable.AddTopView(fileInfo.FolderName, 700);
+ if (isAuto == true)
{
- btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");
+ txtText.TextID = R.MyInternationalizationString.uAutoBackup;
+ }
+
+ //鏃堕棿 2019-11-11T11:31:01
+ var btnTime = rowLayout.frameTable.AddBottomView("", 600);
+ if (fileInfo.ModifyTime.Length >= 13)
+ {
+ btnTime.Text = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(fileInfo.ModifyTime).ToString("yyyy.MM.dd HH:mm:ss");
}
//搴曠嚎
if (addLine == true)
@@ -196,66 +229,30 @@
}
};
- //缂栬緫
- var btnEditor = rowLayout.AddEditorControl();
- btnEditor.ButtonClickEvent += (sender, e) =>
+ //鑷姩澶囦唤涓嶅厑璁哥紪杈�
+ if (isAuto == false)
{
- //鏄剧ず缂栬緫澶囪�冨悕鐢婚潰
- this.ShowEditorBackupForm(fileInfo);
- };
-
- //鍒犻櫎
- var btnDelete = rowLayout.AddDeleteControl();
- btnDelete.ButtonClickEvent += (sender, e) =>
- {
- //纭鍒犻櫎璇ュ浠芥暟鎹�?
- string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);
- this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ //缂栬緫
+ var btnEditor = rowLayout.AddEditorControl();
+ btnEditor.ButtonClickEvent += (sender, e) =>
{
- //鍒犻櫎澶囦唤鏂囨。
- this.DeleteBackInfo(fileInfo.Id);
- });
- };
- }
+ //鏄剧ず缂栬緫澶囪�冨悕鐢婚潰
+ this.ShowEditorBackupForm(fileInfo);
+ };
- #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)
+ //鍒犻櫎
+ var btnDelete = rowLayout.AddDeleteControl();
+ btnDelete.ButtonClickEvent += (sender, e) =>
{
- 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);
- });
+ //纭鍒犻櫎璇ュ浠芥暟鎹�?
+ string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ //鍒犻櫎澶囦唤鏂囨。
+ this.DeleteBackInfo(fileInfo.Id);
+ });
+ };
+ }
}
#endregion
@@ -267,21 +264,26 @@
/// </summary>
/// <param name="BackupClassId"></param>
/// <param name="backName"></param>
- private async void EditorBackInfo(string BackupClassId, string backName)
+ private void EditorBackInfo(string BackupClassId, string backName)
{
- var Pra = new EditorBackUpNamePra();
- Pra.BackupClassId = BackupClassId;
- Pra.BackupName = backName;
- //鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
- Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ //鈽嗐優銉笺偗鈽�
+ //var Pra = new EditorBackUpNamePra();
+ //Pra.BackupClassId = BackupClassId;
+ //Pra.BackupName = backName;
+ ////鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
+ //Pra.LoginAccessToken = HdlUserCenterLogic.GetConnectMainToken();
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
- if (result == false)
- {
- return;
- }
+ //bool result = HdlUserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
+ //if (result == false)
+ //{
+ // return;
+ //}
- this.SetBackupInfoToForm();
+ //HdlThreadLogic.Current.RunThread(() =>
+ //{
+ // //浠庝簯绔幏鍙栨暟鎹�
+ // this.SetBackupInfoToForm();
+ //});
}
#endregion
@@ -292,9 +294,9 @@
/// 鍒犻櫎澶囦唤鏂囨。
/// </summary>
/// <param name="BackupClassId"></param>
- private async void DeleteBackInfo(string BackupClassId)
+ private void DeleteBackInfo(string BackupClassId)
{
- bool success = await HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
+ bool success = HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
if (success == false)
{
return;
@@ -304,7 +306,11 @@
this.nowSelectBackId = string.Empty;
this.nowbtnSelect = null;
}
- this.SetBackupInfoToForm();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庝簯绔幏鍙栨暟鎹�
+ this.SetBackupInfoToForm();
+ });
}
#endregion
@@ -319,66 +325,27 @@
private void ShowEditorBackupForm(BackupListNameInfo fileInfo)
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputForm();
- dialogForm.AddForm(DialogFrameMode.OnlyInput);
+ var dialogForm = new DialogInputControl();
//缂栬緫澶囦唤
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
- dialogForm.Text = fileInfo.BackupName;
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
+ dialogForm.Text = fileInfo.FolderName;
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += ((txtvalue) =>
{
//鐢婚潰鍏抽棴
- dialogForm.CloseForm();
+ dialogForm.CloseDialog();
//鍚嶅瓧涓�鏍锋椂锛屼笉澶勭悊
- if (txtvalue != fileInfo.BackupName)
+ if (txtvalue != fileInfo.FolderName)
{
//缂栬緫澶囦唤鍚嶇О
this.EditorBackInfo(fileInfo.Id, txtvalue);
}
});
}
-
- #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