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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -151,9 +151,7 @@
            bodyFrameLayout.AddChidren(roomScrolView);
            try
            {
                System.Console.WriteLine("roomlist0");
                var roomList = Common.Room.CurrentRoom.GetRoomsByFloorId(floorId);
                System.Console.WriteLine("roomlist" + roomList);
                if (roomList == null || roomList.Count == 0)
                {
                    return;