2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

 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">成员列表接口返回的SubAccountDistributedMark</param>

        /// <param name="memberShardInfo">

        /// <para>成员的分享数据</para>

        /// <para>如果不知道这是什么东西,就New一个,然后缓存起来,调用其他函数都需要这个东西</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;

        }