合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs

@@ -220,13 +220,16 @@
                            //检测本地有没有这个住宅

                            this.CheckIsExsitResidence(info);



                            HdlResidenceLogic.Current.SwitchResidence(info.Id);

                            var result = HdlResidenceLogic.Current.SwitchResidence(info.Id);



                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //重新刷新列表

                                this.listView.RemoveAll();

                                this.SetResidenceInfo(2);

                                if (result == true)

                                {

                                    //重新刷新列表

                                    this.listView.RemoveAll();

                                    this.SetResidenceInfo(2);

                                }

                                //关闭进度条

                                this.CloseProgressBar();

                            });

@@ -344,13 +347,16 @@
                    {

                        HdlThreadLogic.Current.RunThread(() =>

                        {

                            HdlResidenceLogic.Current.SwitchResidence(i_home.Id);

                            var result = HdlResidenceLogic.Current.SwitchResidence(i_home.Id);



                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //重新刷新列表

                                this.listView.RemoveAll();

                                this.SetResidenceInfo(3);

                                if (result == true)

                                {

                                    //重新刷新列表

                                    this.listView.RemoveAll();

                                    this.SetResidenceInfo(3);

                                }

                                //关闭进度条

                                this.CloseProgressBar();

                            });