From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index 140b49e..27cbe3a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -76,7 +76,7 @@
this.ShowProgressBar();
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var autoData = HdlBackupLogic.Current.GetBackupListNameFromDB(BackUpMode.A鑷姩澶囦唤);
+ var autoData = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (autoData == null)
{
//鍏抽棴杩涘害鏉�
@@ -84,7 +84,7 @@
return;
}
//浠庝簯绔幏鍙栨暟鎹�
- var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(BackUpMode.A鎵嬪姩澶囦唤);
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB();
if (pageData == null)
{
//鍏抽棴杩涘害鏉�
@@ -118,8 +118,8 @@
var listSort = new List<string>();
for (int i = 0; i < pageData.Count; i++)
{
- listSort.Add(pageData[i].ModifyTime);
- dic[pageData[i].ModifyTime] = pageData[i];
+ listSort.Add(pageData[i].CreatedOnUtc);
+ dic[pageData[i].CreatedOnUtc] = pageData[i];
}
listSort.Sort();
@@ -163,13 +163,13 @@
}
else
{
- txtText.Text = fileInfo.FolderName;
+ txtText.Text = fileInfo.BackupName;
}
//鏃堕棿
var btnTime = rowLayout.frameTable.AddBottomView("", 600);
- if (fileInfo.ModifyTime.Length >= 13)
+ if (fileInfo.CreatedOnUtc.Length >= 19)
{
- btnTime.Text = HdlCommonLogic.Current.ConvertUtcTimeToLocalTime2(fileInfo.ModifyTime).ToString("yyyy.MM.dd HH:mm:ss");
+ btnTime.Text = UserCenterLogic.ConvertUtcTimeToLocalTime(fileInfo.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm:ss");
}
if (addLine == true)
{
@@ -298,7 +298,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴鎵�鏈夌晫闈�
- HdlFormLogic.Current.CloseAllOpenForm(null, false);
+ UserCenterLogic.CloseAllOpenForm(null, false);
//鍒囨崲鍒颁富椤�
UserView.UserPage.Instance.ReFreshControl();
});
@@ -325,12 +325,12 @@
var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
if (result2 == false)
{
- //缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uBindGatewayFailPleaseUploadAgain));
+ //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+ this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�");
return;
}
//鍒涘缓涓�涓浠藉悕瀛�
- string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backName, BackUpMode.A鎵嬪姩澶囦唤);
+ string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
if (backupClassId == null)
{
//鍒涘缓澶囦唤鍚嶅瓧澶辫触
@@ -377,11 +377,11 @@
var result2 = HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
if (result2 == false)
{
- //缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uBindGatewayFailPleaseUploadAgain));
+ //涓存椂杩欎箞鍐�,鏂颁簯绔氨浼氬啓鍒癛鏂囦欢浜�
+ this.ShowMassage(ShowMsgType.Tip, "缁戝畾缃戝叧澶辫触,璇烽噸鏂颁笂浼�");
return;
}
- int result = HdlBackupLogic.Current.DoUpLoadAutoBackupDataByHand();
+ int result = HdlAutoBackupLogic.DoUpLoadAutoBackupDataByHand();
if (result == -1)
{
//鏂囦欢涓婁紶澶辫触
@@ -415,17 +415,28 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- bool result = HdlBackupLogic.Current.EditorBackupName(BackupClassId, backName);
- this.CloseProgressBar();
+ var Pra = new EditorBackUpNamePra();
+ Pra.BackupClassId = BackupClassId;
+ Pra.BackupName = backName;
+ //鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
+ Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- if (result == true)
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
+ if (result == false)
{
- HdlThreadLogic.Current.RunThread(() =>
- {
- //浠庝簯绔幏鍙栨暟鎹�
- this.SetBackupInfoToForm();
- });
+ //缂栬緫澶囦唤鍚嶇О澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uEditorBackupNameFail);
+ this.ShowMassage(ShowMsgType.Error, msg);
+ //鍏抽棴
+ this.CloseProgressBar();
+ return;
}
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庝簯绔幏鍙栨暟鎹�
+ this.SetBackupInfoToForm();
+ });
}
#endregion
@@ -475,7 +486,7 @@
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
//璇疯緭鍏ュ浠藉悕绉�
dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
- dialogForm.Text = fileInfo.FolderName;
+ dialogForm.Text = fileInfo.BackupName;
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += ((textValue) =>
@@ -490,7 +501,7 @@
dialogForm.CloseDialog();
//鍚嶅瓧涓�鏍锋椂锛屼笉澶勭悊
- if (textValue != fileInfo.FolderName)
+ if (textValue != fileInfo.BackupName)
{
//缂栬緫澶囦唤鍚嶇О
this.EditorBackInfo(fileInfo.Id, textValue);
--
Gitblit v1.8.0