Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Projec...

wei

2020-12-11 4f40e8385ff6725be8e8b642e50f9f7201a27dfa

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs

@@ -35,29 +35,81 @@
            };
        }

        ///// <summary>
        ///// 退出登录操作
        ///// </summary>
        //void Logout()
        //{
        //    #region 保存本地数据至文件夹
        //    string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
        //    new System.Threading.Thread(() =>
        //    {
        //        try
        //        {
        //            var backuplist = FileUtils.ReadFiles();
        //            //移动文件
        //            foreach (var fileName in backuplist)
        //            {
        //                System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
        //                if (fileInfo.Exists)
        //                {
        //                    fileInfo.MoveTo(oldRegionRootPath + fileName);
        //                    MainPage.Log("move file : " + fileName);
        //                }
        //            }
        //            FileUtils.DeleteRegionFiles(oldRegionRootPath);
        //        }
        //        catch (Exception ex)
        //        {
        //            MainPage.Log($"xxx:{ex.Message}");
        //        }
        //        finally
        //        {
        //            FileUtils.DeleteAllFile();
        //        }
        //    }).Start();
        //    #endregion

        //    //2.注销推送
        //    new HttpServerRequest().SignOutPush();
        //    //3.跳转登录页面
        //    UserInfo.Current.LastTime = DateTime.MinValue;
        //    UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
        //    UserInfo.Current.SaveUserInfo();
        //    MainPage.GoLoginPage(UserInfo.Current);
        //    DB_ResidenceData.residenceData.EixtAccount();
        //}

        /// <summary>
        /// 退出登录操作
        /// </summary>
        void Logout()
        public void LogoutNew()
        {
            #region 保存本地数据至文件夹
            string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
            new System.Threading.Thread(() =>
            //加载Loading效果
            var waitPage = new Loading();
            bodyView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));

            new Thread(() =>
            {
                try
                {
                    var backuplist = FileUtils.ReadFiles();
                    FileUtils.DeleteRegionFiles(oldRegionRootPath);
                    //移动文件
                    foreach (var fileName in backuplist)
                    {
                        System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
                        if (fileInfo.Exists)
                        {
                            fileInfo.MoveTo(oldRegionRootPath + fileName);
                            MainPage.Log("move file : " + fileName);
                        }
                    }
                    #region 保存本地数据至文件夹
                    //string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
                    ////清空之前的住宅文件
                    //FileUtils.DeleteRegionFiles(oldRegionRootPath);
                    //var backuplist = FileUtils.ReadFiles();
                    ////移动文件
                    //foreach (var fileName in backuplist)
                    //{
                    //    System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
                    //    if (fileInfo.Exists)
                    //    {
                    //        fileInfo.MoveTo(oldRegionRootPath + fileName);
                    //        MainPage.Log("move file : " + fileName);
                    //    }
                    //}
                    #endregion
                }
                catch (Exception ex)
                {
@@ -65,19 +117,27 @@
                }
                finally
                {
                    FileUtils.DeleteAllFile();
                    //FileUtils.DeleteAllFile();
                    //2.注销推送
                    new HttpServerRequest().SignOutPush();
                    //3.跳转登录页面
                    UserInfo.Current.LastTime = DateTime.MinValue;
                    UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
                    UserInfo.Current.SaveUserInfo();
                    Shared.Application.RunOnMainThread(() =>
                    {
                        if (waitPage != null)
                        {
                            waitPage.RemoveFromParent();
                            waitPage = null;
                        }

                        MainPage.GoLoginPage(UserInfo.Current);
                        DB_ResidenceData.residenceData.EixtAccount();

                    });
                }
            }).Start();
            #endregion

            //2.注销推送
            new HttpServerRequest().SignOutPush();
            //3.跳转登录页面
            UserInfo.Current.LastTime = DateTime.MinValue;
            UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
            UserInfo.Current.SaveUserInfo();
            MainPage.GoLoginPage(UserInfo.Current);
            DB_ResidenceData.residenceData.EixtAccount();
        }

        /// <summary>
@@ -89,7 +149,7 @@
            {
                Action okAction = () =>
                {
                    Logout();
                    LogoutNew();
                };
                new ConfirmDialog().ShowDialog(StringId.Tip, StringId.IfConfirmLogout, okAction);
            };
@@ -218,7 +278,7 @@
                                    System.IO.File.Delete(imageView.ImagePath);
                                }
                                //重命名保存
                                FileUtils.WriteFileByBytes(imageUrl, imageBytes);
                                Common.FileUtlis.Files.WriteFileByBytes(imageUrl, imageBytes);
                                imageView.ImagePath = null;
                                imageView.ImageBytes = imageBytes;
                                //上传成功