From b3e96fce4cc01113128ddf8e0a18fc19594a9e56 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 05 十二月 2019 18:38:30 +0800
Subject: [PATCH] 一个新的版本

---
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index ea31def..9f840e4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -117,6 +117,15 @@
                     listResidenceSort.Add(pageData.PageData[i].Id);
                 }
             }
+            for (int i = 0; i < listResidenceSort.Count; i++)
+            {
+                //绉婚櫎鎺変笉瀛樺湪浜嗙殑椤哄簭
+                if (dicData.ContainsKey(listResidenceSort[i]) == false)
+                {
+                    listResidenceSort.RemoveAt(i);
+                    i--;
+                }
+            }
             //淇濆瓨椤哄簭
             string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceSortFile);
             UserCenterLogic.SaveFileContent(fullName, listResidenceSort);
@@ -132,6 +141,10 @@
                 this.dicResidenceData = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();
                 for (int i = 0; i < listResidenceSort.Count; i++)
                 {
+                    if (dicData.ContainsKey(listResidenceSort[i]) == false)
+                    {
+                        continue;
+                    }
                     var info = dicData[listResidenceSort[i]];
                     if (info.IsOthreShare == false)
                     {
@@ -206,12 +219,13 @@
                     {
                         HdlThreadLogic.Current.RunThread(async () =>
                         {
-                            ProgressBar.Show();
+                            this.ShowProgressBar();
+
                             Config.Instance.HomeId = info.Id;
                             Global.CreateHomeDirectory(info.Id);
                             Config.Instance.Save();
                             //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
-                            await UserCenterLogic.InitUserCenterMenmoryAndThread();
+                            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
 
                             Room.InitAllRoom();
 

--
Gitblit v1.8.0