合并代码

黄学彪

2020-01-10 9064c76e6a795ae735cac52d98bed178a27c2a87

 ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs

@@ -149,8 +149,10 @@

            var roomScrolView = new VerticalScrolViewLayout { };
            bodyFrameLayout.AddChidren(roomScrolView);
            try
            {
            var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
            if (roomList == null)
                if (roomList == null || roomList.Count == 0)
            {
                return;
            }
@@ -211,6 +213,11 @@
                }
            }
        }
            catch (Exception ex)
            {
                string tt=ex.Message;
            }
        }

        #endregion