From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期五, 10 七月 2020 10:52:13 +0800 Subject: [PATCH] 2020-07-10-01 --- ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs | 27 +++++---------------------- 1 files changed, 5 insertions(+), 22 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs index d5c6847..8dfdc85 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs @@ -80,7 +80,7 @@ private void InitRoomListRow() { //鑾峰彇妤煎眰鐨勬埧闂� - var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys); + var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys); this.listRoomSort.Clear(); for (int i = 0; i < listRoom.Count; i++) { @@ -138,13 +138,7 @@ } //缂栬緫 - var btnEditor = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false); - btnEditor.BackgroundColor = 0xff4a4a4a; - btnEditor.TextSize = 12; - btnEditor.TextColor = UserCenterColor.Current.White; - btnEditor.TextAlignment = TextAlignment.Center; - btnEditor.TextID = R.MyInternationalizationString.uEditor; - frameRow.AddRightView(btnEditor); + var btnEditor = frameRow.AddEditorControl(); btnEditor.ButtonClickEvent += (sender, e) => { var form = new EditorRoomInforForm(); @@ -152,30 +146,19 @@ }; //鍒犻櫎 - var btnDelete = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false); - btnDelete.BackgroundColor = 0xfff75858; - btnDelete.TextSize = 12; - btnDelete.TextColor = UserCenterColor.Current.White; - btnDelete.TextAlignment = TextAlignment.Center; - btnDelete.TextID = R.MyInternationalizationString.uDelete; - frameRow.AddRightView(btnDelete); + var btnDelete = frameRow.AddDeleteControl(); btnDelete.ButtonClickEvent += (sender, e) => { //纭鍒犻櫎鎴块棿? this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () => { - if (Common.Room.CurrentRoom.Id == room.Id) - { - //濡傛灉鍒犻櫎鐨勬槸褰撳墠鎴块棿鐨勮瘽 - Common.Room.CurrentRoom = Common.Room.Lists[0]; - } - Common.Room.CurrentRoom.Remove(room.FileName); + HdlRoomLogic.Current.RemoveRoom(room.Id); //璋冩暣楂樺害 frameRow.RemoveFromParent(); listView.AdjustRealHeight(Application.GetRealHeight(23)); //淇濆瓨椤哄簭 this.listRoomSort.Remove(room.Id); - Common.Room.CurrentRoom.SaveRoomSort(floorKeys, this.listRoomSort); + HdlRoomLogic.Current.SaveRoomSort(floorKeys, this.listRoomSort); }); }; } -- Gitblit v1.8.0