From 16604a593202f2f87adf71abd57d036fe7da3b52 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 10:39:42 +0800
Subject: [PATCH] 同步了全部的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 7ea6cfd..b9e473b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -53,13 +53,13 @@
         /// </summary>
         /// <param name="listDistributedMark"></param>
         /// <returns></returns>
-        public async Task<List<string>> SetShardFileToLocation(List<string> listDistributedMark)
+        private async Task<List<string>> SetShardFileToLocation(List<string> listDistributedMark)
         {
             if (listDistributedMark.Count == 0)
             {
                 return new List<string>();
             }
-            ProgressBar.SetMaxValue(listDistributedMark.Count);
+            int listMarkCount = listDistributedMark.Count;
 
             List<string> listFile = new List<string>();
             //鏂囦欢澶�
@@ -69,8 +69,9 @@
             Shared.Common.CommonPage.BackKeyCanClick = false;
             UserCenterResourse.Option.AppCanSignout = false;
 
-            foreach (string keys in listDistributedMark)
+            for (int i = 0; i < listDistributedMark.Count; i++)
             {
+                string keys = listDistributedMark[i];
                 var dataPra = new { DistributedMark = keys, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.isAdministrator };
                 var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetOneShareData", false, dataPra);
                 if (result == null)
@@ -86,7 +87,7 @@
                 //淇濆瓨鍒版寚瀹氭枃浠跺す涓�
                 Global.WriteFileToDirectoryByBytes(strDir, dataResult.ShareName, dataResult.ShareDataBytes);
                 //璁剧疆杩涘害鍊�
-                ProgressBar.SetValue(1);
+                ProgressFormBar.Current.SetValue(i + 1, listMarkCount);
             }
 
             //鍏佽鎸夌郴缁熺殑杩斿洖閿�
@@ -284,11 +285,9 @@
             //浠庝簯绔幏鍙栦笅鏉ユ枃浠�
             if (listAddMark.Count > 0)
             {
-                //寮哄埗鎸囧畾鏂囨湰闄勫姞淇℃伅锛氬叡浜暟鎹悓姝ヤ腑
-                string msg = Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing);
-                //寮�鍚繘搴︽潯
-                ProgressBar.Show(msg);
-                ProgressBar.SetAppendText(msg);
+                //寮�鍚繘搴︽潯 鍏变韩鏁版嵁鍚屾涓�
+                ProgressFormBar.Current.Start();
+                ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing));
 
                 //灏嗗垎浜殑鏁版嵁瀛樺叆鏈湴(鑾峰彇鐨勬槸鏈湴娌℃湁鐨�)
                 this.ClearShardDirectory();
@@ -296,7 +295,7 @@
                 if (listDbFile == null)
                 {
                     //鍏抽棴
-                    ProgressBar.Close();
+                    ProgressFormBar.Current.Close();
                     return false;
                 }
 
@@ -334,11 +333,9 @@
                 //鍙湁鎴愬憳鎵嶆湁杩欎釜姒傚康
                 return true;
             }
-            //寮哄埗鎸囧畾鏂囨湰闄勫姞淇℃伅锛氬叡浜暟鎹悓姝ヤ腑
-            string msg = Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing);
-            //寮�鍚繘搴︽潯
-            ProgressBar.Show(msg);
-            ProgressBar.SetAppendText(msg);
+            //寮�鍚繘搴︽潯  鍏变韩鏁版嵁鍚屾涓�
+            ProgressFormBar.Current.Start();
+            ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uShardDataIsSynchronizing));
 
             if (dicUpdateTime == null)
             {
@@ -357,7 +354,7 @@
                 if (string.IsNullOrEmpty(result) == true)
                 {
                     //鍏抽棴
-                    ProgressBar.Close();
+                    ProgressFormBar.Current.Close();
                     return false;
                 }
                 var listShardData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GetShardInfoResult>>(result);
@@ -435,7 +432,7 @@
             //淇濆瓨鍏ㄩ儴鍒嗕韩鏂囦欢鐨勬洿鏂版棩鏈�
             this.SaveAllShardFileAgoUpdateTime(dicUpdateTime);
             //鍏抽棴
-            ProgressBar.Close();
+            ProgressFormBar.Current.Close();
 
             return true;
         }

--
Gitblit v1.8.0