From 9dcd17ee7578c5a06bfcd960cc72ea2995716004 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 七月 2020 16:43:38 +0800
Subject: [PATCH] 20200715

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 77e9d49..dd4feb8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -34,7 +34,7 @@
 #if DEBUG
             btnUserTypeName.MouseUpEventHandler = (sender, e) =>
             {
-                var pm = new HDL_ON.DAL.Server.HttpServerRequest();
+                var pm = new DAL.Server.HttpServerRequest();
                 var iddd = pm.GetRegionLastBackupId();
                 Dialog dialog = new Dialog();
 
@@ -97,9 +97,7 @@
                         BackgroundColor = CSS.CSS_Color.BackgroundColor
                     });
                 }
-
                 dialog.Show();
-
             };
 #endif
             EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
@@ -145,7 +143,6 @@
                         Tag = home.RegionID
                     };
                     contentView.AddChidren(btnHomeName);
-                    //if(btnHomeName)
 
                     if (MainPage.LoginUser.regionList.IndexOf(home) < MainPage.LoginUser.regionList.Count - 1)
                     {
@@ -166,14 +163,16 @@
                 
                     };
                 }
-
                 dialog.Show();
             };
 
             btnResidenceDownIcon.MouseUpEventHandler = eventHandler;
             btnCurResidenceName.MouseUpEventHandler = eventHandler;
         }
-
+        /// <summary>
+        /// 鏇存崲褰撳墠閫変腑浣忓畢
+        /// </summary>
+        /// <param name="homeTemp"></param>
         void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
         {
             if (DB_ResidenceData.residenceData.CurReginID == homeTemp.RegionID)
@@ -189,9 +188,14 @@
                     int index = 0;
                     string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
                     FileUtils.DeleteRegionFiles(oldRegionRootPath);
+                    //绉诲姩鏂囦欢
                     foreach (var fileName in backuplist)
                     {
                         System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
+                        if(fileName == "headImage.png")
+                        {
+                            continue;
+                        }
                         if (fileInfo.Exists)
                         {
                             fileInfo.MoveTo(oldRegionRootPath + fileName);
@@ -204,7 +208,15 @@
                             waitPage.Text = pro.ToString() + "%";
                         });
                     }
-                    FileUtils.DeleteAllFile();
+                    //鍒犻櫎鏈湴鏂囦欢
+                    foreach (var fileName in backuplist)
+                    {
+                        if (fileName == "headImage.png")
+                        {
+                            continue;
+                        }
+                        FileUtils.DeleteFile(fileName);
+                    }
                     //鍊掑嚭鏂颁綇瀹呮暟鎹�
                     string newRegionRootPath = FileUtils.CreateRegionBackup(homeTemp.RegionID.ToString());
                     FileUtils.RestoreRegionFiles(newRegionRootPath);
@@ -217,8 +229,6 @@
                     Application.RunOnMainThread(() =>
                     {
                         btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
-                        //new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.SwitchRegionSuccessfully),
-                        //          Language.StringByID(StringId.Close)).Show();
                     });
                 }
                 catch (Exception ex)
@@ -241,7 +251,6 @@
             })
             { IsBackground = true }.Start();
         }
-
         #endregion
 
         #region 浣忓畢绠$悊

--
Gitblit v1.8.0