Revert "1"

wxr

2021-07-01 43b0d5870d528f23ecd6aeceb6cfd4325188b46f

 HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs

@@ -4,8 +4,14 @@

namespace HDL_ON
{
    /// <summary>
    /// 房间楼层选择弹窗
    /// </summary>
    public class FloorSelectPopupDialog
    {
        /// <summary>
        /// 
        /// </summary>
        public FloorSelectPopupDialog()
        {
        }
@@ -18,30 +24,35 @@
        /// 二级联动List
        /// </summary>
        List<List<RoomCellInfo>> mSecondList = new List<List<RoomCellInfo>>();
     

        /// <summary>
        /// 
        /// 读取本地楼层和房间数据，弹窗显示
        /// </summary>
        /// <param name="selectAction">回调选中事件，回调选中的uid</param>
        /// <param name="selectTag">设置选中的tga标记</param>
        public void ShowView(Action<string> selectAction, string selectTag = DiySelectPopupDialog.ALLSELECT)
        {

            //楼层集合数据
            var floorList = SpatialInfo.CurrentSpatial.FloorList;
            //房间集合数据
            var roomList = SpatialInfo.CurrentSpatial.RoomList;

            //根据楼层和房间数据结情况加载对于效果弹窗
            if (floorList == null || floorList.Count == 0)
            {
                //没有楼层只加载房间
                if (roomList == null)
                {
                    Utlis.WriteLine("roomList null");
                    return;
                    Utlis.WriteLine("floorList and roomList null");
                    roomList = new List<Room>();
                }

                mFirstList.Clear();
                //遍历所有房间列表
                foreach (var room in roomList)
                {
                    mFirstList.Add(new RoomCellInfo() { Title = room.roomName, TagId = room.roomId });
                    mFirstList.Add(new RoomCellInfo() { Title = room.roomName, TagId = room.uid });
                }
                //弹窗一级联动选择窗口
                var roomSelectPopupDialog = new DiySelectPopupDialog();
                roomSelectPopupDialog.ShowView(mFirstList, null, selectAction, selectTag);
            }
@@ -52,12 +63,13 @@
                //一级数组为楼层
                foreach (var floor in floorList)
                {
                    mFirstList.Add(new RoomCellInfo() { Title = floor.roomName, TagId = floor.roomId });
                    //遍历所有楼层列表以及楼层所关联房间的列表
                    mFirstList.Add(new RoomCellInfo() { Title = floor.roomName, TagId = floor.uid });
                    var mList = new List<RoomCellInfo>();
                    var allRoom = roomList.FindAll((room) => room.parentId == floor.roomId);
                    var allRoom = roomList.FindAll((room) => room.parentId == floor.uid);
                    foreach (var mRoom in allRoom)
                    {
                        mList.Add(new RoomCellInfo() { Title = mRoom.roomName, TagId = mRoom.roomId });
                        mList.Add(new RoomCellInfo() { Title = mRoom.roomName, TagId = mRoom.uid });
                    }

                    if(mList == null)
@@ -66,7 +78,7 @@
                    }
                    mSecondList.Add(mList);
                }

                //弹窗二级联动选择窗口
                var roomSelectPopupDialog = new DiySelectPopupDialog();
                roomSelectPopupDialog.ShowView(mFirstList, mSecondList, selectAction, selectTag);