From b3abfd30576871c32f2839a322fa3bb783f96498 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:10:10 +0800
Subject: [PATCH] 2020-12-12 1.解锁逻辑优化

---
 HDL_ON/UI/UI1-Login/LoginPageBLL.cs |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 4a8bae7..0998722 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -599,7 +599,6 @@
                             {
                                 //璺宠浆椤甸潰----
                                 MainPage.GoUserPage();
-                                MainPage.InitializationData();
                                 return;
                             }
                         });
@@ -615,24 +614,23 @@
                              */
 
                             /*
-                             鏌ョ湅鏈湴鏄惁瀛樺湪鏁版嵁
-                             瀛樺湪鍒欏鍑�
+                             * 鏌ョ湅鏈湴鏄惁瀛樺湪鏁版嵁
+                             * 瀛樺湪鍒欏鍑�
                              */
-                            var isExis = FileUtils.IsExisFolder(DB_ResidenceData.residenceData.CurReginID);
-                            if (isExis)
-                            {
-                                FileUtils.DeleteAllFile();
-                                string regionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID);
-                                FileUtils.RestoreRegionFiles(regionRootPath);
-                                DB_ResidenceData.residenceData.EixtAccount();
-                                OnAppConfig.Instance.RefreshUserConfig();
-                                SpatialInfo.CurrentSpatial.InitRoomFunction();
-                            }
+                            //var isExis = FileUtils.IsExisFolder(DB_ResidenceData.residenceData.CurReginID);
+                            //if (isExis)
+                            //{
+                            //    FileUtils.DeleteAllFile();
+                            //    string regionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID);
+                            //    FileUtils.RestoreRegionFiles(regionRootPath);
+                            //    DB_ResidenceData.residenceData.EixtAccount();
+                            //    OnAppConfig.Instance.RefreshUserConfig();
+                            //    SpatialInfo.CurrentSpatial.InitRoomFunction();
+                            //}
                             Application.RunOnMainThread(() =>
                             {
                                 //璺宠浆椤甸潰----
                                 MainPage.GoUserPage();
-                                MainPage.InitializationData();
                             });
                         }
                         else
@@ -707,7 +705,8 @@
                 UserInfo.Current.userName = revertData.name;
                 UserInfo.Current.userMobileInfo = "";//閲嶇疆鐢ㄦ埛鎵嬫満
                 UserInfo.Current.userEmailInfo = "";//閲嶇疆鐢ㄦ埛閭
-                UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
+                UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//
+                UserInfo.Current.CurReginID = "";
                 UserInfo.Current.SaveUserInfo();
                 MainPage.Log("鐧诲綍鎴愬姛銆�");
                 result = true;
@@ -759,12 +758,13 @@
             var responsePack = pm.GetHomePager();
             if (responsePack == StateCode.SUCCESS)
             {
-                //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
-                if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
-                {
-                    result = true;
-                }
-                //result = true;
+                ////2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
+                //if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
+                //{
+                //    result = true;
+                //}
+                //2020-12-10 娌℃湁浣忓畢鐧诲綍鎴愬姛锛屼絾鏄笉鑳借繘鍏ヤ富鐣岄潰
+                result = true;
             }
             else
             {

--
Gitblit v1.8.0