1：修改点唱房问题

2：修改我的家族展示问题

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -3347,16 +3347,19 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             mBinding!!.headCone.text = mRoomInfoResp?.room_info?.head_line?.content
 
             mBinding!!.headAvate.setOnClickListener { view ->
-                RoomUserInfoFragment.show(
-                    roomId,
-                    mRoomInfoResp?.room_info?.head_line?.user_id,
-                    "",
-                    getHostUser(),
-                    false,
-                    2,
-                    isNumberWhether(),
-                    supportFragmentManager
-                )
+//                RoomUserInfoFragment.show(
+//                    roomId,
+//                    mRoomInfoResp?.room_info?.head_line?.user_id,
+//                    "",
+//                    getHostUser(),
+//                    false,
+//                    2,
+//                    isNumberWhether(),
+//                    supportFragmentManager
+//                )
+
+                ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE)
+                    .withString("userId", mRoomInfoResp?.room_info?.head_line?.user_id).navigation()
             }
 
             mBinding!!.ivQuanQiang.setOnClickListener { v: View? ->
@@ -3556,7 +3559,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             }
 
             is RoomTaskEvent -> {
-                if (taskId != null && taskId != "9" && taskId !="8") { //这是每日任务完成发送私聊信息的事件
+                if (taskId != null && taskId != "9" && taskId != "8") { //这是每日任务完成发送私聊信息的事件
                     RetrofitClient.getInstance()
                         .dailyTasksComplete(taskId, object : BaseObserver<RoomSingleton?>() {
                             override fun onSubscribe(d: Disposable) {

MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java

@@ -59,6 +59,7 @@ public class RequestedSongsAdapter extends BaseQuickAdapter<SongPlaylist.SongPla
         // 根据位置显示不同的UI
         if (helper.getLayoutPosition() == 0) {
             // 第一个是正在播放
+            helper.getView(R.id.tv_request_status).setVisibility(View.VISIBLE);
             helper.setText(R.id.tv_request_status, "正在播放");
             helper.setTextColor(R.id.tv_request_status, 0xFF3ABC6D);
             helper.setBackgroundRes(R.id.tv_request_status, android.graphics.Color.TRANSPARENT);

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestedSongsFragment.java

@@ -189,7 +189,7 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
                     // 只有当有新数据时才更新
                     if (!newSongs.isEmpty()) {
                         songList.addAll(newSongs);
-                        adapter.addData(songList);
+                        adapter.addData(newSongs);
                         mBinding.smartRefreshLayout.finishLoadMore(true);
                     } else {
                         // 没有新数据，但不算加载失败