From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index e334f30..3b83ece 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)
{
//鍏抽棴杩涘害鏉�
@@ -156,6 +156,10 @@
bool result = HdlGatewayBackupLogic.Current.RecoverGateway(this.realGateway, this.nowSelectBackId, autoID == this.nowSelectBackId ? 1 : 0);
if (result == true)
{
+ //缃戝叧鏁版嵁鎭㈠鎴愬姛!
+ msg = Language.StringByID(R.MyInternationalizationString.uRestoreGatewayDataSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+
HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴杩欎釜鐣岄潰
@@ -263,7 +267,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 +275,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 +296,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 +308,11 @@
this.nowSelectBackId = string.Empty;
this.nowbtnSelect = null;
}
- this.SetBackupInfoToForm();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庝簯绔幏鍙栨暟鎹�
+ this.SetBackupInfoToForm();
+ });
}
#endregion
--
Gitblit v1.8.0