2020.2.28

gxc

2020-02-28 66a9965c44ecc32a6696abca876ab9d1cd091584

 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,15 @@
                    {

                        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();



@@ -264,8 +280,7 @@
        private void ShowEditorNameForm(Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)

        {

            //生成一个弹窗画面

            var dialogForm = new DialogInputForm();

            dialogForm.AddForm(DialogFrameMode.OnlyInput);

            var dialogForm = new DialogInputControl();

            //编辑住宅

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uChangedName));

            //请输入住宅名称

@@ -283,7 +298,7 @@
                    return;

                }

                //画面关闭

                dialogForm.CloseForm();

                dialogForm.CloseDialog();



                if (info.Name != textValue)

                {

@@ -341,8 +356,7 @@
        private void ShowAddNameForm()

        {

            //生成一个弹窗画面

            var dialogForm = new DialogInputForm();

            dialogForm.AddForm(DialogFrameMode.OnlyInput);

            var dialogForm = new DialogInputControl();

            //创建住宅

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCreatResidence));

            //请输入住宅名称

@@ -358,7 +372,7 @@
                    return;

                }

                //画面关闭

                dialogForm.CloseForm();

                dialogForm.CloseDialog();



                //保存住宅

                this.AddNewResidence(textValue);

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

            {

                Page = 1,

                PageSize = 500

                PageSize = 5000

            };

        }