From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 67 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 86deaa9..c8523c8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -93,6 +93,15 @@
//杩涘害鏉�
this.ShowProgressBar();
+ //鑾峰彇鑷姩澶囦唤鐨勬暟鎹�
+ var pageAuto = await HdlBackupLogic.Current.GetBackupListNameFromDB(3, HdlGatewayLogic.Current.GetGatewayId(realGateway));
+ if (pageAuto == null)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar(ShowReLoadMode.YES);
+ return;
+ }
+
//浠庝簯绔幏鍙栨暟鎹�
var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(2, HdlGatewayLogic.Current.GetGatewayId(realGateway));
if (pageData == null)
@@ -108,14 +117,24 @@
{
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);
+ this.AddRowlayout(pageData[i], i != pageData.Count - 1, false);
}
this.btnDownload?.RemoveFromParent();
- if (pageData.Count > 0)
+ if (pageData.Count > 0 || pageAuto.Count > 0)
{
//涓嬭浇
this.btnDownload = new BottomClickButton();
@@ -134,7 +153,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//璇诲彇澶囦唤鏂囨。
- bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId);
+ bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
@@ -149,7 +168,6 @@
//璋冩暣鐪熷疄楂樺害
listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
}
-
});
}
@@ -162,25 +180,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);
+ var txtText = rowLayout.frameTable.AddTopView(fileInfo.BackupName, 700);
+ if (isAuto == true)
+ {
+ txtText.TextID = R.MyInternationalizationString.uAutoBackup;
+ }
+
//鏃堕棿 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);
+ var btnTime = rowLayout.frameTable.AddBottomView("", 600);
if (fileInfo.CreatedOnUtc.Length >= 19)
{
- btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");
+ btnTime.Text = UserCenterLogic.ConvertUtcTimeToLocalTime(fileInfo.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm:ss");
}
//搴曠嚎
if (addLine == true)
@@ -211,13 +228,17 @@
}
};
- //缂栬緫
- var btnEditor = rowLayout.AddEditorControl();
- btnEditor.ButtonClickEvent += (sender, e) =>
+ //鑷姩澶囦唤涓嶅厑璁哥紪杈�
+ if (isAuto == false)
{
- //鏄剧ず缂栬緫澶囪�冨悕鐢婚潰
- this.ShowEditorBackupForm(fileInfo);
- };
+ //缂栬緫
+ var btnEditor = rowLayout.AddEditorControl();
+ btnEditor.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず缂栬緫澶囪�冨悕鐢婚潰
+ this.ShowEditorBackupForm(fileInfo);
+ };
+ }
//鍒犻櫎
var btnDelete = rowLayout.AddDeleteControl();
@@ -298,8 +319,8 @@
//缂栬緫澶囦唤
dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uEditorBackup));
- //璇疯緭鍏ュ娉ㄥ悕绉�
- dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup));
+ //璇疯緭鍏ュ浠藉悕绉�
+ dialogForm.SetTipText(Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackupName));
dialogForm.Text = fileInfo.BackupName;
//鎸変笅纭鎸夐挳
--
Gitblit v1.8.0