From 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 14 十二月 2020 10:44:41 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath

---
 HDL-ON_iOS/Resources/Language.ini                       |    1 +
 HDL-ON_Android/Assets/Language.ini                      |    1 +
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs |    3 ++-
 HDL_ON/Entity/DB_ResidenceData.cs                       |    4 +++-
 HDL_ON/Common/R.cs                                      |    5 ++++-
 HDL_ON/DAL/Server/HttpServerRequest.cs                  |    6 +++++-
 HDL_ON/DAL/Server/IMessageCommon.cs                     |    2 ++
 7 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 93ba88f..a38b640 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -565,6 +565,7 @@
 9046=淇敼鎴愬姛!
 9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
 9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
+9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 6135dff..821af88 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -565,6 +565,7 @@
 9046=淇敼鎴愬姛!
 9047=鎮ㄧ殑瀵嗙爜宸茬粡淇敼鐢熸晥锛岃閲嶆柊鐧诲綍
 9048=浣跨敤璐﹀彿瀵嗙爜鐧诲綍
+9049=瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
 
 10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
 10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index aa32558..62a3a56 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -709,7 +709,10 @@
         /// 浣跨敤璐﹀彿瀵嗙爜鐧诲綍
         /// </summary>
         public const int LogWithAccountAndPassword = 9048;
-
+        /// <summary>
+        /// 瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+        /// </summary>
+        public const int AccountLoginLock = 9049;
 
         #region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
         /// <summary>
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index fa14c90..45bed8c 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -492,7 +492,8 @@
                         UserInfo.Current.regionList.Add(home);
                     }
                     //浣忓畢琚垹闄�
-                    if (UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID) == null)
+                    var findHome = UserInfo.Current.regionList.Find((obj) => obj.RegionID == DB_ResidenceData.Instance.CurrentRegion.RegionID);
+                    if (findHome == null)
                     {
                         Shared.Application.RunOnMainThread(() =>
                         {
@@ -509,6 +510,9 @@
                     }
                     else
                     {
+                        //鍒锋柊褰撳墠浣忓畢
+                        DB_ResidenceData.Instance.CurrentRegion = findHome;
+                        DB_ResidenceData.Instance.SaveResidenceData();
                         UserInfo.Current.SaveUserInfo();
                         //鍒锋柊涓�娆′綇瀹呯綉鍏�
                         GetHomeGatewayList();
diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index f96ee70..038ae9f 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -107,6 +107,8 @@
             //stateCodeDic["10017"] = StringId.10017;
             ////绉熸埛涓嶅瓨鍦�
             //stateCodeDic["10018"] = StringId.10018;
+            //瀵嗙爜杩炵画杈撻敊娆℃暟宸茶揪鍒�10娆�,鐢ㄦ埛宸茶閿佸畾,璇锋鏃�0鐐瑰悗鍐嶇櫥闄�
+            stateCodeDic["10019"] = StringId.AccountLoginLock;
 
             ////鏋氫妇绫诲瀷閿欒
             //stateCodeDic["11003"] = StringId.11003;
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index b3e7e1f..75e411a 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -7,6 +7,7 @@
 
 namespace HDL_ON.Entity
 {
+    [System.Serializable]
     public class DB_ResidenceData
     {
         public DB_ResidenceData()
@@ -18,7 +19,8 @@
         /// </summary>
         public string MasterToken;
 
-        RegionInfoRes _residecenInfo;
+        //RegionInfoRes _residecenInfo;
+        RegionInfoRes _residecenInfo = new RegionInfoRes();
         /// <summary>
         /// 浣忓畢鍩虹淇℃伅
         /// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index e9a23bf..0e20ca4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -163,7 +163,8 @@
                     {
                         var regionId = (string)btnHomeName.Tag;
                         dialog.Close();
-                        LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+                        //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+                        LoadEvent_ChangeCurHome(home);
                         LoadContentView();
                     };
                 }

--
Gitblit v1.8.0