From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs | 59 +++++++++++++++--------------------------------------------
1 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index e7c1728..c8a666e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -70,13 +70,13 @@
/// <summary>
/// 浠庝簯绔幏鍙栨暟鎹�
/// </summary>
- private async void SetBackupInfoToForm()
+ private void SetBackupInfoToForm()
{
//杩涘害鏉�
this.ShowProgressBar();
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var autoData = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var autoData = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (autoData == null)
{
//鍏抽棴杩涘害鏉�
@@ -84,7 +84,7 @@
return;
}
//浠庝簯绔幏鍙栨暟鎹�
- var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB();
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB();
if (pageData == null)
{
//鍏抽棴杩涘害鏉�
@@ -283,10 +283,10 @@
/// <param name="BackupClassId"></param>
private void LoadBackupInfo(string BackupClassId)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//浠庝簯绔幏鍙栧浠界殑鏂囦欢
- bool result = await HdlBackupLogic.Current.LoadAppBackupInfo(BackupClassId);
+ bool result = HdlBackupLogic.Current.LoadAppBackupInfo(BackupClassId);
if (result == false)
{
//鏂囦欢鎭㈠澶辫触
@@ -295,7 +295,7 @@
return;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴鎵�鏈夌晫闈�
UserCenterLogic.CloseAllOpenForm();
@@ -319,10 +319,10 @@
/// <param name="backName"></param>
private void UpLoadBackInfo(string backName)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鍒涘缓涓�涓浠藉悕瀛�
- string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
+ string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
if (backupClassId == null)
{
//鍒涘缓澶囦唤鍚嶅瓧澶辫触
@@ -333,7 +333,7 @@
}
//涓婁紶鏁版嵁鍒颁簯绔�
- bool result = await HdlBackupLogic.Current.UpLoadBackupFileToDB(backupClassId);
+ bool result = HdlBackupLogic.Current.UpLoadBackupFileToDB(backupClassId);
if (result == false)
{
//鏂囦欢涓婁紶澶辫触
@@ -363,9 +363,9 @@
/// </summary>
private void UpLoadAutoBackupInfo()
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- int result = await HdlAutoBackupLogic.DoUpLoadAutoBackupData();
+ int result = HdlAutoBackupLogic.DoUpLoadAutoBackupData();
if (result == -1)
{
//鏂囦欢涓婁紶澶辫触
@@ -394,7 +394,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)
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -405,7 +405,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾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)
{
//缂栬緫澶囦唤鍚嶇О澶辫触
@@ -432,16 +432,9 @@
/// </summary>
/// <param name="BackupClassId"></param>
/// <param name="showMode"></param>
- public async void DeleteBackInfo(string BackupClassId, ShowErrorMode showMode = ShowErrorMode.YES)
+ public void DeleteBackInfo(string BackupClassId, ShowErrorMode showMode = ShowErrorMode.YES)
{
- //杩涘害鏉�
- this.ShowProgressBar();
-
- bool success = await HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
-
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
-
+ bool success = HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
if (success == false)
{
if (showMode == ShowErrorMode.YES)
@@ -533,28 +526,6 @@
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 鎶婃湰鍦版墍鏈夋枃浠剁Щ鍔ㄥ埌鑷姩澶囦唤鏂囦欢澶�
- /// </summary>
- private void CopyLocationAllFileToAutoBackDirectory()
- {
- List<string> listAllFile = Shared.Common.Global.FileListByHomeId();
-
- string strroot = Common.Config.Instance.FullPath;
- string autoPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
- foreach (string file in listAllFile)
- {
- //鍒ゆ柇鏄惁鏄簲璇ヤ笂浼犵殑鏂囦欢
- if (HdlBackupLogic.Current.IsNotUpLoadFile(file) == true)
- {
- continue;
- }
- string sourseName = System.IO.Path.Combine(strroot, file);
- string newName = System.IO.Path.Combine(autoPath, file);
- System.IO.File.Copy(sourseName, newName, true);
- }
- }
/// <summary>
/// 妫�娴嬪鑰冨悕绉�
--
Gitblit v1.8.0