From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index 9cb5ad7..3558710 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -19,10 +19,6 @@
/// 妤煎眰鐨勪富閿�
/// </summary>
private string floorKeys = string.Empty;
- /// <summary>
- /// 鎴块棿椤哄簭
- /// </summary>
- private List<string> listRoomSort = new List<string>();
#endregion
@@ -80,12 +76,7 @@
private void InitRoomListRow()
{
//鑾峰彇妤煎眰鐨勬埧闂�
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);
- this.listRoomSort.Clear();
- for (int i = 0; i < listRoom.Count; i++)
- {
- this.listRoomSort.Add(listRoom[i].Id);
- }
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);
this.listView.RemoveAll();
listView.Height = bodyFrameLayout.Height + Application.GetRealHeight(6);
@@ -152,18 +143,10 @@
//纭鍒犻櫎鎴块棿?
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);
});
};
}
--
Gitblit v1.8.0