From ff3cfcf62632bf43e51a6b6098c203bf0f5cddbc Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 19:53:29 +0800
Subject: [PATCH] 2019.12.24
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 7ea6cfd..766493a 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;
}
@@ -481,7 +478,6 @@
/// <summary>
/// 鑾峰彇鎴愬憳鍏变韩鍒楄〃鐒跺悗淇濆瓨鍒版湰鍦�(鐢ㄥ畬涔嬪悗鏈�濂借皟鐢ㄦ竻绌� ClearShardDirectory鍑芥暟娓呯┖)
/// </summary>
- /// <param name="SubAccountDistributedMark">鎴愬憳鍒楄〃鎺ュ彛杩斿洖鐨凷ubAccountDistributedMark</param>
/// <param name="memberShardInfo">
/// <para>鎴愬憳鐨勫垎浜暟鎹�</para>
/// <para>濡傛灉涓嶇煡閬撹繖鏄粈涔堜笢瑗�,灏盢ew涓�涓�,鐒跺悗缂撳瓨璧锋潵,璋冪敤鍏朵粬鍑芥暟閮介渶瑕佽繖涓笢瑗�</para>
@@ -498,8 +494,9 @@
}
memberShardInfo.Refresh = false;
- //鎵撳紑杩涘害鏉�
- ProgressBar.Show();
+ //姝ｅ湪鑾峰彇鍒嗕韩鏁版嵁
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uShardContentGetting));
var infoPra = new
{
@@ -511,7 +508,7 @@
if (result == null)
{
//鍏抽棴杩涘害鏉�
- ProgressBar.Close();
+ ProgressFormBar.Current.Close();
return false;
}
var listData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ReceiveShardInfoResult>>(result);
@@ -546,7 +543,7 @@
if (listFile == null)
{
//鍏抽棴杩涘害鏉�
- ProgressBar.Close();
+ ProgressFormBar.Current.Close();
return false;
}
@@ -554,7 +551,7 @@
this.GetMemberShardContentListFromLocal(memberShardInfo);
//鍏抽棴杩涘害鏉�
- ProgressBar.Close();
+ ProgressFormBar.Current.Close();
return true;
}
--
Gitblit v1.8.0