上传一个版本

黄学彪

2020-09-01 dee21bf452a8979d0515d13e534fbb69ed9715dd

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

@@ -124,21 +124,14 @@
        {

            //获取住宅信息

            var Pra = new GetResidenceInfoPra();

            string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" });

            string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" }, false);

            if (string.IsNullOrEmpty(resultData) == true)

            {

                return false;

            }

            var pageData = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResidenceRes>(resultData);



            //暂时存储数据

            var dicData = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();

            var listResidenceSort = new List<string>();

            for (int i = 0; i < pageData.PageData.Count; i++)

            {

                dicData[pageData.PageData[i].Id] = pageData.PageData[i];

                listResidenceSort.Add(pageData.PageData[i].Id);

            }

            //排序住宅

            var listHouse = HdlResidenceLogic.Current.SortHouse(pageData.PageData);



            HdlThreadLogic.Current.RunMain(() =>

            {

@@ -149,18 +142,14 @@
                listView.Height = bodyFrameLayout.Height;



                this.dicResidenceData = new Dictionary<string, Common.ResponseEntity.ResidenceObj>();

                for (int i = 0; i < listResidenceSort.Count; i++)

                for (int i = 0; i < listHouse.Count; i++)

                {

                    if (dicData.ContainsKey(listResidenceSort[i]) == false)

                    {

                        continue;

                    }

                    var info = dicData[listResidenceSort[i]];

                    var info = listHouse[i];



                    //收集该账号住宅的数据

                    this.dicResidenceData[info.Id] = info;

                    //添加住宅的行(有网情况)

                    this.AddRowLayoutByOnline(info, i != listResidenceSort.Count - 1);

                    this.AddRowLayoutByOnline(info, i != listHouse.Count - 1);

                }

                //调整列表控件的高度

                this.listView.AdjustRealHeight(Application.GetRealHeight(23));

@@ -231,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();

                            });

@@ -258,6 +250,14 @@
                //分享的,不能更改

                return;

            }

            //过户

            var btnTransfer = rowLayout.AddDeleteControl();

            btnTransfer.TextID = R.MyInternationalizationString.uTransfer;

            btnTransfer.ButtonClickEvent += (sender, e) =>

            {

                var form = new TransferResidenceMainForm();

                form.AddForm();

            };

            //更改

            var btnChanged = rowLayout.AddEditorControl();

            btnChanged.TextID = R.MyInternationalizationString.uChanged1;

@@ -355,13 +355,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();

                            });

@@ -376,14 +379,14 @@
                    form.AddForm(flage);

                }

            };

            //更改

            var btnChanged = rowLayout.AddEditorControl();

            btnChanged.TextID = R.MyInternationalizationString.uChanged1;

            btnChanged.ButtonClickEvent += (sender, e) =>

            {

                //显示编辑名称界面

                this.ShowEditorNameForm(null, i_home, btnHome);

            };

            ////更改

            //var btnChanged = rowLayout.AddEditorControl();

            //btnChanged.TextID = R.MyInternationalizationString.uChanged1;

            //btnChanged.ButtonClickEvent += (sender, e) =>

            //{

            //    //显示编辑名称界面

            //    this.ShowEditorNameForm(null, i_home, btnHome);

            //};

        }



        #endregion

@@ -450,7 +453,7 @@
        /// <param name="ResidenceName"></param>

        /// <param name="info"></param>

        /// <returns></returns>

        private async void EditorResidenceName(string ResidenceName, Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)

        private void EditorResidenceName(string ResidenceName, Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)

        {

            //检测能否保存住宅

            if (this.CheckIsCanSaveResidence(info.Id, ResidenceName, true) == false)

@@ -460,18 +463,12 @@
            //开启进度条

            this.ShowProgressBar();



            var Pra = new EditorResidencePra();

            Pra.HomeId = info.Id;

            Pra.Name = ResidenceName;

            Pra.IsOtherAccountCtrl = false;

            Pra.LoginAccessToken = Config.Instance.Token;

            var result = HdlResidenceLogic.Current.EditorResidenceName(info.Id, ResidenceName);



            //编辑住宅

            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);

            //关闭进度条

            this.CloseProgressBar();



            if (flage == true)

            if (result == true)

            {

                HdlThreadLogic.Current.RunMain(() =>

                {