合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

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

@@ -850,11 +850,11 @@
                ProgressBar.SetAppendText(string.Empty);



                //0:已经同步过，不需要同步,这个时候需要提示备份

                if (result == 0)

                {

                    //开启自动备份提示

                    //HdlAutoBackupLogic.ShowAutoBackupPromptedForm();

                }

                //if (result == 0)

                //{

                //    //开启自动备份提示

                //    HdlAutoBackupLogic.ShowAutoBackupPromptedForm();

                //}

            }



            //恢复可关闭进度条

@@ -1153,7 +1153,7 @@
            Global.CreateEmptyDirectory(directory);



            //用户图片目录路径【文件夹】

            if (!System.IO.Directory.Exists(UserCenterResourse.Option.UserPictruePath))
            if (UserCenterResourse.Option.UserPictruePath != string.Empty && !System.IO.Directory.Exists(UserCenterResourse.Option.UserPictruePath))
            {
                System.IO.Directory.CreateDirectory(UserCenterResourse.Option.UserPictruePath);
            }