From c0ce2f57a4f836ebeb9e7b8b4b5a4407fd78dc86 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 23 九月 2020 10:06:05 +0800
Subject: [PATCH] 上传
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index c8523c8..3b8829a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -85,7 +85,7 @@
/// <summary>
/// 浠庝簯绔幏鍙栨暟鎹�
/// </summary>
- private async void SetBackupInfoToForm()
+ private void SetBackupInfoToForm()
{
this.nowSelectBackId = string.Empty;
this.nowbtnSelect = null;
@@ -94,7 +94,7 @@
this.ShowProgressBar();
//鑾峰彇鑷姩澶囦唤鐨勬暟鎹�
- var pageAuto = await HdlBackupLogic.Current.GetBackupListNameFromDB(3, HdlGatewayLogic.Current.GetGatewayId(realGateway));
+ var pageAuto = HdlBackupLogic.Current.GetBackupListNameFromDB(3, realGateway.GwId);
if (pageAuto == null)
{
//鍏抽棴杩涘害鏉�
@@ -103,7 +103,7 @@
}
//浠庝簯绔幏鍙栨暟鎹�
- var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(2, HdlGatewayLogic.Current.GetGatewayId(realGateway));
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);
if (pageData == null)
{
//鍏抽棴杩涘害鏉�
@@ -238,20 +238,20 @@
//鏄剧ず缂栬緫澶囪�冨悕鐢婚潰
this.ShowEditorBackupForm(fileInfo);
};
- }
- //鍒犻櫎
- var btnDelete = rowLayout.AddDeleteControl();
- btnDelete.ButtonClickEvent += (sender, e) =>
- {
- //纭鍒犻櫎璇ュ浠芥暟鎹�?
- string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);
- this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ //鍒犻櫎
+ var btnDelete = rowLayout.AddDeleteControl();
+ btnDelete.ButtonClickEvent += (sender, e) =>
{
- //鍒犻櫎澶囦唤鏂囨。
- this.DeleteBackInfo(fileInfo.Id);
- });
- };
+ //纭鍒犻櫎璇ュ浠芥暟鎹�?
+ string msg = Language.StringByID(R.MyInternationalizationString.uDoDeleteBackupMsg);
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ //鍒犻櫎澶囦唤鏂囨。
+ this.DeleteBackInfo(fileInfo.Id);
+ });
+ };
+ }
}
#endregion
@@ -263,7 +263,7 @@
/// </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;
@@ -271,13 +271,17 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
if (result == false)
{
return;
}
- this.SetBackupInfoToForm();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庝簯绔幏鍙栨暟鎹�
+ this.SetBackupInfoToForm();
+ });
}
#endregion
@@ -288,9 +292,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;
@@ -300,7 +304,11 @@
this.nowSelectBackId = string.Empty;
this.nowbtnSelect = null;
}
- this.SetBackupInfoToForm();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庝簯绔幏鍙栨暟鎹�
+ this.SetBackupInfoToForm();
+ });
}
#endregion
--
Gitblit v1.8.0