2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

 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,14 +219,17 @@
                    {

                        HdlThreadLogic.Current.RunThread(async () =>

                        {

                            ProgressBar.Show();

                            this.ShowProgressBar();



                            Config.Instance.HomeId = info.Id;

                            Global.CreateHomeDirectory(info.Id);

                            //重新初始化住宅对象

                            Config.Instance.Home = House.GetHouseByHouseId(info.Id);

                            Config.Instance.Save();

                            //刷新个人中心的内存及线程

                            await UserCenterLogic.InitUserCenterMenmoryAndThread();

                            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);



                            Room.InitAllRoom();

                            HdlRoomLogic.Current.InitAllRoom();



                            HdlThreadLogic.Current.RunMain(() =>

                            {

@@ -464,7 +480,7 @@
                {

                    //保存顺序

                    listResidenceSort.Remove(keys);

                    Room.CurrentRoom.SaveFloorSort(listResidenceSort);

                    HdlRoomLogic.Current.SaveFloorSort(listResidenceSort);



                    this.listView.RemoveAll();

                    //数据已经变更

@@ -513,7 +529,7 @@
            public PageSettingInfo PageSetting = new PageSettingInfo()

            {

                Page = 1,

                PageSize = 500

                PageSize = 5000

            };

        }