From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
index e92ecfe..d8c8cb4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
@@ -58,15 +58,15 @@
                 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);
             if (result == false)
             {
-                ProgressBar.Close();
+                ProgressFormBar.Current.Close();
                 return -1;
             }
 
@@ -74,11 +74,11 @@
             result = await DoDeleteFileFromDB(listDelete);
             if (result == false)
             {
-                ProgressBar.Close();
+                ProgressFormBar.Current.Close();
                 return -1;
             }
 
-            ProgressBar.Close();
+            ProgressFormBar.Current.Close();
 
             return 1;
         }
@@ -90,9 +90,11 @@
         /// <returns></returns>
         private async static Task<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);
@@ -110,7 +112,7 @@
                     return false;
                 }
                 //璁剧疆杩涘害鍊�
-                ProgressBar.SetValue(list.Count);
+                ProgressFormBar.Current.SetValue(i + 1, listFileCount);
             }
             return true;
         }
@@ -371,8 +373,9 @@
             //鑷姩澶囦唤鍙湁涓�涓�
             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);
@@ -392,6 +395,9 @@
             //鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
             var file2 = System.IO.File.Create(checkFile);
             file2.Close();
+
+            //閲嶆柊鍒锋柊浣忓畢瀵硅薄
+            UserCenterLogic.RefreshHomeObject();
 
             return 1;
         }
@@ -500,9 +506,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;
@@ -517,9 +523,9 @@
             }
             if (info.Day == 0)
             {
-                Application.RunOnMainThread(() =>
+                HdlThreadLogic.Current.RunMain(() =>
                 {
-                    var form = new HdlBackup.HdlAutoBackupSettionForm();
+                    var form = new HdlBackup.HdlAutoBackupForm();
                     form.AddForm();
                 });
                 return;
@@ -530,11 +536,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