From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 74 +++++++++++++------------------------
1 files changed, 26 insertions(+), 48 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 3b83ece..b43b043 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -94,17 +94,17 @@
this.ShowProgressBar();
//鑾峰彇鑷姩澶囦唤鐨勬暟鎹�
- var pageAuto = HdlBackupLogic.Current.GetBackupListNameFromDB(3, realGateway.GwId);
- if (pageAuto == null)
+ var listAutoData = HdlGatewayBackupLogic.Current.GetGatewayBackupListFromDb(realGateway.GwId, BackUpMode.A鑷姩澶囦唤);
+ if (listAutoData == null)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar(ShowReLoadMode.YES);
return;
}
- //浠庝簯绔幏鍙栨暟鎹�
- var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);
- if (pageData == null)
+ //浠庝簯绔幏鍙栨墜鍔ㄥ浠芥暟鎹�
+ var listHandData = HdlGatewayBackupLogic.Current.GetGatewayBackupListFromDb(realGateway.GwId, BackUpMode.A鎵嬪姩澶囦唤);
+ if (listHandData == null)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar(ShowReLoadMode.YES);
@@ -117,24 +117,20 @@
{
listView.RemoveAll();
listView.RecoverHeight();
-
- //鑷姩澶囦唤鐨処D
- string autoID = string.Empty;
- if (pageAuto.Count > 0)
+ if (listAutoData.Count > 0)
{
- autoID = pageAuto[0].Id;
//娣诲姞鑷姩澶囦唤琛�
- this.AddRowlayout(pageAuto[0], pageData.Count > 0, true);
+ this.AddRowlayout(listAutoData[0], listAutoData.Count > 0, true);
}
- for (int i = 0; i < pageData.Count; i++)
+ for (int i = 0; i < listHandData.Count; i++)
{
//娣诲姞澶囦唤琛�
- this.AddRowlayout(pageData[i], i != pageData.Count - 1, false);
+ this.AddRowlayout(listHandData[i], i != listHandData.Count - 1, false);
}
this.btnDownload?.RemoveFromParent();
- if (pageData.Count > 0 || pageAuto.Count > 0)
+ if (listAutoData.Count > 0 || listHandData.Count > 0)
{
//涓嬭浇
this.btnDownload = new BottomClickButton();
@@ -153,13 +149,9 @@
HdlThreadLogic.Current.RunThread(() =>
{
//璇诲彇澶囦唤鏂囨。
- bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);
+ bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway.GwId, this.nowSelectBackId);
if (result == true)
{
- //缃戝叧鏁版嵁鎭㈠鎴愬姛!
- msg = Language.StringByID(R.MyInternationalizationString.uRestoreGatewayDataSuccess);
- this.ShowMassage(ShowMsgType.Tip, msg);
-
HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴杩欎釜鐣岄潰
@@ -191,17 +183,17 @@
listView.AddChidren(rowLayout);
//澶囦唤鍚嶅瓧
- var txtText = rowLayout.frameTable.AddTopView(fileInfo.BackupName, 700);
+ var txtText = rowLayout.frameTable.AddTopView(fileInfo.FolderName, 700);
if (isAuto == true)
{
txtText.TextID = R.MyInternationalizationString.uAutoBackup;
}
- //鏃堕棿 2019-11-11T11:31:01
+ //鏃堕棿
var btnTime = rowLayout.frameTable.AddBottomView("", 600);
- if (fileInfo.CreatedOnUtc.Length >= 19)
+ if (fileInfo.ModifyTime.Length == 13)
{
- btnTime.Text = UserCenterLogic.ConvertUtcTimeToLocalTime(fileInfo.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm:ss");
+ btnTime.Text = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(fileInfo.ModifyTime).ToString("yyyy.MM.dd HH:mm:ss");
}
//搴曠嚎
if (addLine == true)
@@ -265,17 +257,11 @@
/// <summary>
/// 缂栬緫澶囦唤鍚嶇О
/// </summary>
- /// <param name="BackupClassId"></param>
+ /// <param name="backupClassId"></param>
/// <param name="backName"></param>
- private 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();
-
- bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
+ var result = HdlGatewayBackupLogic.Current.EditorGatewayBackupName(backupClassId, backName);
if (result == false)
{
return;
@@ -295,15 +281,15 @@
/// <summary>
/// 鍒犻櫎澶囦唤鏂囨。
/// </summary>
- /// <param name="BackupClassId"></param>
- private void DeleteBackInfo(string BackupClassId)
+ /// <param name="backupClassId"></param>
+ private void DeleteBackInfo(string backupClassId)
{
- bool success = HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
+ bool success = HdlGatewayBackupLogic.Current.DeleteGatewayBackup(this.realGateway.GwId, backupClassId);
if (success == false)
{
return;
}
- if (this.nowSelectBackId == BackupClassId)
+ if (this.nowSelectBackId == backupClassId)
{
this.nowSelectBackId = string.Empty;
this.nowbtnSelect = null;
@@ -327,21 +313,13 @@
private void ShowEditorBackupForm(BackupListNameInfo fileInfo)
{
//鐢熸垚涓�涓脊绐楃敾闈�
- var dialogForm = new DialogInputControl();
-
- //缂栬緫澶囦唤
- dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
- //璇疯緭鍏ュ浠藉悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
- dialogForm.Text = fileInfo.BackupName;
-
- //鎸変笅纭鎸夐挳
- dialogForm.ComfirmClickEvent += ((txtvalue) =>
+ this.ShowDialogInputForm(Language.StringByID(R.MyInternationalizationString.uEditorBackup), fileInfo.FolderName,
+ Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName), (contr, txtvalue) =>
{
//鐢婚潰鍏抽棴
- dialogForm.CloseDialog();
+ contr.CloseDialog();
//鍚嶅瓧涓�鏍锋椂锛屼笉澶勭悊
- if (txtvalue != fileInfo.BackupName)
+ if (txtvalue != fileInfo.FolderName)
{
//缂栬緫澶囦唤鍚嶇О
this.EditorBackInfo(fileInfo.Id, txtvalue);
--
Gitblit v1.8.0