From f23ad1b3f9f6193f35f72104d690b21dc67d5c1f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 七月 2020 12:35:25 +0800
Subject: [PATCH] 去掉了访问外网的异步
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
index 1a83c35..9215637 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
@@ -22,10 +22,10 @@
/// 鎵ц涓婁紶鑷姩澶囦唤鏁版嵁(0:娌℃湁鍙笂浼犵殑鑷姩澶囦唤鏁版嵁 1:鎴愬姛 -1锛氬け璐�)
/// </summary>
/// <returns></returns>
- public async static Task<int> DoUpLoadAutoBackupData()
+ public static int DoUpLoadAutoBackupData()
{
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (data == null)
{
return -1;
@@ -58,27 +58,27 @@
return 0;
}
- //寮�鍚繘搴︽潯
- ProgressBar.SetMaxValue(listEditor.Count + listDelete.Count);
- ProgressBar.Show();
+ //寮�鍚繘搴︽潯 姝ｅ湪涓婁紶澶囦唤鏂囦欢
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileUploading));
//涓婁紶鏂囦欢鍒颁簯绔�
- bool result = await UpLoadBackupFileToDB(listEditor);
+ bool result = UpLoadBackupFileToDB(listEditor);
if (result == false)
{
- ProgressBar.Close();
+ ProgressFormBar.Current.Close();
return -1;
}
//鍒犻櫎鏂囦欢
- result = await DoDeleteFileFromDB(listDelete);
+ result = DoDeleteFileFromDB(listDelete);
if (result == false)
{
- ProgressBar.Close();
+ ProgressFormBar.Current.Close();
return -1;
}
- ProgressBar.Close();
+ ProgressFormBar.Current.Close();
return 1;
}
@@ -88,11 +88,13 @@
/// </summary>
/// <param name="listFile"></param>
/// <returns></returns>
- private async static Task<bool> UpLoadBackupFileToDB(List<string> listFile)
+ private static bool UpLoadBackupFileToDB(List<string> listFile)
{
+ int listFileCount = listFile.Count;
string backUpDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
- foreach (string file in listFile)
+ for (int i = 0; i < listFile.Count; i++)
{
+ string file = listFile[i];
var datainfo = new FileInfoData();
datainfo.BackupFileName = file;
datainfo.BackupFileContent = ReadDirctoryFileByName(backUpDir, file);
@@ -104,13 +106,13 @@
list.Add(datainfo);
//鎵ц鏄笂浼�
- bool falge = await DoUpLoadInfoToDB(list);
+ bool falge = DoUpLoadInfoToDB(list);
if (falge == false)
{
return false;
}
//璁剧疆杩涘害鍊�
- ProgressBar.SetValue(list.Count);
+ ProgressFormBar.Current.SetValue(i + 1, listFileCount);
}
return true;
}
@@ -120,7 +122,7 @@
/// </summary>
/// <param name="listData">鍒犻櫎鐨勬枃浠�</param>
/// <returns></returns>
- private async static Task<bool> DoDeleteFileFromDB(List<string> listData)
+ private static bool DoDeleteFileFromDB(List<string> listData)
{
if (listData.Count == 0)
{
@@ -128,7 +130,7 @@
}
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (data == null || data.Count == 0)
{
return true;
@@ -144,7 +146,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
upData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("App/DeleteAppBackupFile", true, upData);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("App/DeleteAppBackupFile", true, upData);
if (falge == false)
{
return false;
@@ -166,7 +168,7 @@
/// </summary>
/// <param name="listData">涓婁紶鐨勬暟鎹�</param>
/// <returns></returns>
- private async static Task<bool> DoUpLoadInfoToDB(List<FileInfoData> listData)
+ private static bool DoUpLoadInfoToDB(List<FileInfoData> listData)
{
var nowZigbeeNumHomeId = Shared.Common.Config.Instance.Home.Id;
@@ -176,7 +178,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
upData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("App/HomeAppAutoDataBackup", true, upData);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("App/HomeAppAutoDataBackup", true, upData, null, true);
if (falge == false)
{
return false;
@@ -320,6 +322,15 @@
//鍒涘缓涓�涓┖鏂囦欢
var file = System.IO.File.Create(newFile);
file.Close();
+
+ //鑷姩澶囦唤鐩綍
+ strBackPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
+ //濡傛灉澶囦唤鍒楄〃閲岄潰鏈夎繖涓笢瑗跨殑璇濓紝绉婚櫎鎺�
+ string delFile = System.IO.Path.Combine(strBackPath, fileName);
+ if (System.IO.File.Exists(delFile) == true)
+ {
+ System.IO.File.Delete(delFile);
+ }
}
#endregion
@@ -327,18 +338,18 @@
#region 鈻� 鍚屾鏁版嵁___________________________
/// <summary>
- /// 鍚屾浜戠鏁版嵁(浠呴檺APP鍚姩涔嬪悗) -1锛氬紓甯� 0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝� 1锛氭甯稿悓姝�
+ /// 鍚屾浜戠鏁版嵁(浠呴檺APP鍚姩涔嬪悗) -1锛氬紓甯� 0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝� 1锛氭甯稿悓姝� 2:娌℃湁鑷姩澶囦唤鏁版嵁
/// </summary>
/// <returns></returns>
- public static async Task<int> SynchronizeDbAutoBackupData()
+ public static int SynchronizeDbAutoBackupData()
{
//鍒ゆ柇鏄惁鑳藉鍚屾鏁版嵁
string checkFile = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoDownLoadBackupCheckFile);
//濡傛灉鏈湴宸茬粡鎷ユ湁浜嗚繖涓枃浠讹紝鍒欒鏄庝笉鏄柊鎵嬫満锛屼笉鍐嶈嚜鍔ㄨ繕鍘�
if (System.IO.File.Exists(checkFile) == true)
{
- //鍚屾鏈嶅姟鍣ㄧ殑鍙栨秷浜嗙殑鍒嗕韩鍐呭
- await HdlShardLogic.Current.SynchronizeDeleteSharedContent();
+ //鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭
+ HdlShardLogic.Current.SynchronizeDbSharedContent();
return 0;
}
@@ -346,7 +357,7 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
//鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭
- await HdlShardLogic.Current.SynchronizeDbSharedContent();
+ HdlShardLogic.Current.SynchronizeDbSharedContent();
//鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
var file = System.IO.File.Create(checkFile);
file.Close();
@@ -354,7 +365,7 @@
}
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (data == null)
{
return -1;
@@ -362,20 +373,21 @@
if (data.Count == 0)
{
//鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭
- await HdlShardLogic.Current.SynchronizeDbSharedContent();
+ HdlShardLogic.Current.SynchronizeDbSharedContent();
//鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
var file = System.IO.File.Create(checkFile);
file.Close();
- return 1;
+ return 2;
}
//鑷姩澶囦唤鍙湁涓�涓�
string backId = data[0].Id;
- //寮哄埗鎸囧畾鏂囨湰闄勫姞淇℃伅锛氳处鍙锋暟鎹悓姝ヤ腑
- ProgressBar.SetAppendText(Language.StringByID(R.MyInternationalizationString.uAccountDataIsSynchronizing));
+ //璐﹀彿鏁版嵁鍚屾涓�
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uAccountDataIsSynchronizing));
//浠庝簯绔幏鍙栧浠界殑鏂囦欢锛岀劧鍚庡瓨鍏ユ湰鍦版寚瀹氱殑涓存椂鏂囦欢澶�
- string tempDir = await HdlBackupLogic.Current.GetBackFileFromDBAndSetToLocation(backId);
+ string tempDir = HdlBackupLogic.Current.GetBackFileFromDBAndSetToLocation(backId);
if (tempDir == null)
{
//鍒犻櫎妫�娴嬫枃浠�
@@ -389,12 +401,12 @@
//娌℃湁閿欒鐨勮瘽锛屽垯绉诲姩鍒板綋鍓嶄綇瀹呮枃浠跺す涓嬮潰
Global.MoveDirectoryFileToHomeDirectory(tempDir, true);
- //鍚屾鏈嶅姟鍣ㄧ殑鍙栨秷浜嗙殑鍒嗕韩鍐呭
- await HdlShardLogic.Current.SynchronizeDeleteSharedContent();
-
//鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
var file2 = System.IO.File.Create(checkFile);
file2.Close();
+
+ //閲嶆柊鍒锋柊浣忓畢瀵硅薄
+ UserCenterLogic.RefreshHomeObject();
return 1;
}
@@ -503,9 +515,9 @@
string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupNotPromptedFile);
if (System.IO.File.Exists(fullName) == false)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- var form = new HdlBackup.HdlAutoBackupSettionForm();
+ var form = new HdlBackup.HdlAutoBackupForm();
form.AddForm();
});
return;
@@ -520,9 +532,9 @@
}
if (info.Day == 0)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- var form = new HdlBackup.HdlAutoBackupSettionForm();
+ var form = new HdlBackup.HdlAutoBackupForm();
form.AddForm();
});
return;
@@ -533,11 +545,12 @@
//鏃堕棿宸茬粡瓒呰繃
if (intDay > info.Day)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- var form = new HdlBackup.HdlAutoBackupSettionForm();
+ var form = new HdlBackup.HdlAutoBackupForm();
form.AddForm();
});
+ return;
}
}
--
Gitblit v1.8.0