Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-19 4a9318077bd095fbc7c57c593e5ca8185603dac4

 HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs

@@ -40,7 +40,7 @@
                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 +52,12 @@
                //一级数组为楼层
                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)