From 2029e64ec0491f7e511dc15bffaf821bfbabe2de Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 20 七月 2020 14:10:22 +0800 Subject: [PATCH] 上传一个很特别的新版本 --- ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 47 +++++++++++++++-------------------------------- 1 files changed, 15 insertions(+), 32 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs index 3300808..c384d1e 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs @@ -130,15 +130,8 @@ 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)); @@ -376,14 +365,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 @@ -460,18 +449,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, new List<string> { "NotCheck" }); //鍏抽棴杩涘害鏉� this.CloseProgressBar(); - if (flage == true) + if (result == true) { HdlThreadLogic.Current.RunMain(() => { -- Gitblit v1.8.0