Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs

@@ -98,6 +98,10 @@
        /// <returns></returns>

        public async Task<string> GetBackFileFromDBAndSetToLocation(string BackupClassId, bool IsGatewayAutoBackup = false, string ZigbeeUniqueId = null)

        {

            //不允许按系统的返回键

            Shared.Common.CommonPage.BackKeyCanClick = false;

            UserCenterResourse.Option.AppCanSignout = false;



            //首先先创建一个临时文件夹,存在文件则清空

            string newDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadBackupTempDirectory);

            Global.CreateEmptyDirectory(newDir, true);

@@ -111,6 +115,9 @@
            {

                //关闭进度条

                ProgressBar.Close();

                //允许按系统的返回键

                Shared.Common.CommonPage.BackKeyCanClick = true;

                UserCenterResourse.Option.AppCanSignout = true;

                return null;

            }

            //设置最大值

@@ -131,6 +138,9 @@
                {

                    //关闭进度条

                    ProgressBar.Close(true);

                    //允许按系统的返回键

                    Shared.Common.CommonPage.BackKeyCanClick = true;

                    UserCenterResourse.Option.AppCanSignout = true;

                    return null;

                }



@@ -141,6 +151,9 @@
                {

                    //关闭进度条

                    ProgressBar.Close();

                    //允许按系统的返回键

                    Shared.Common.CommonPage.BackKeyCanClick = true;

                    UserCenterResourse.Option.AppCanSignout = true;

                    return null;

                }

                //将输入写入本地的临时文件夹

@@ -150,6 +163,9 @@
            }

            //关闭进度条

            ProgressBar.Close();

            //允许按系统的返回键

            Shared.Common.CommonPage.BackKeyCanClick = true;

            UserCenterResourse.Option.AppCanSignout = true;



            return newDir;

        }

@@ -275,6 +291,10 @@
                ProgressBar.Show();

            }



            //不允许按系统的返回键

            Shared.Common.CommonPage.BackKeyCanClick = false;

            UserCenterResourse.Option.AppCanSignout = false;



            //你说为什么这里不分一个函数出来（理论上是分函数出来的）

            //是因为如果分函数的话，会出现双重异步，导致主线程的进度条的百分比永远定死0%

            foreach (string file in listNormalFile)

@@ -284,6 +304,9 @@
                {

                    //关闭进度条

                    ProgressBar.Close(true);

                    //允许按系统的返回键

                    Shared.Common.CommonPage.BackKeyCanClick = true;

                    UserCenterResourse.Option.AppCanSignout = true;

                    return false;

                }

                //判断是否是应该上传的文件

@@ -306,6 +329,9 @@
                {

                    //关闭进度条

                    ProgressBar.Close();

                    //允许按系统的返回键

                    Shared.Common.CommonPage.BackKeyCanClick = true;

                    UserCenterResourse.Option.AppCanSignout = true;

                    return false;

                }

                //设置进度值

@@ -319,6 +345,9 @@
                {

                    //关闭进度条

                    ProgressBar.Close(true);

                    //允许按系统的返回键

                    Shared.Common.CommonPage.BackKeyCanClick = true;

                    UserCenterResourse.Option.AppCanSignout = true;

                    return false;

                }



@@ -331,6 +360,9 @@
                {

                    //关闭进度条

                    ProgressBar.Close();

                    //允许按系统的返回键

                    Shared.Common.CommonPage.BackKeyCanClick = true;

                    UserCenterResourse.Option.AppCanSignout = true;

                    return false;

                }

                //设置进度值

@@ -346,6 +378,9 @@


            //进度条关闭

            ProgressBar.Close();

            //允许按系统的返回键

            Shared.Common.CommonPage.BackKeyCanClick = true;

            UserCenterResourse.Option.AppCanSignout = true;



            return true;

        }

@@ -670,7 +705,7 @@
        /// <returns></returns>

        private string GetBase64Text(string fileName)

        {

            string path = UserCenterResourse.LocalRootPath;

            string path = Config.Instance.FullPath;

            string fullName = System.IO.Path.Combine(path, fileName);



            FileStream fs = File.OpenRead(fullName);