1:修改点唱房展示错误

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

@@ -80,6 +80,7 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
                 queren(2, data.getId(), data.getDelete_me_coin());
             }
         });
+        adapter.setuserId(userId);
 
     }
 
@@ -185,6 +186,7 @@ public class RelationshipFragment extends BaseMvpDialogFragment<RoomUserPresente
                     adapter.setNewData(list.getZhenai());
                 }
             }
+            adapter.notifyDataSetChanged();
         }
     }
 

MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/HeartCpActivity.kt

@@ -2,6 +2,8 @@ package com.xscm.modulemain.activity.user.activity
 
 import android.os.Bundle
 import com.alibaba.android.arouter.launcher.ARouter
+import com.scwang.smartrefresh.layout.api.RefreshLayout
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.xscm.modulemain.BaseMvpActivity
 import com.xscm.modulemain.R
 import com.xscm.modulemain.activity.user.conacts.HeartCpContact
@@ -38,6 +40,8 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
     private var leftUserId: Int = 0
     private var rightUserId: Int = 0
 
+    private var page: Int=1
+
     override fun doDone() {
         super.doDone()
         userId = intent.getIntExtra("userId", 0)
@@ -48,7 +52,7 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
         if (userId == 0){
             userId=intent.getStringExtra("userId")?.toInt()!!
         }
-        MvpPre.getHeartCpData(userId)
+        MvpPre.getHeartCpData(userId,page)
 
         mBinding.ivBack.setOnClickListener {
             finish()
@@ -86,6 +90,19 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
             finish()
         }
 
+        mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(object :
+            OnRefreshLoadMoreListener {
+            override fun onLoadMore(refreshLayout: RefreshLayout) {
+                page++
+                MvpPre.getHeartCpData(userId,page)
+            }
+
+            override fun onRefresh(refreshLayout: RefreshLayout) {
+                page = 1 // 重置页码
+                MvpPre.getHeartCpData(userId,page)
+            }
+        })
+
     }
 
     override fun initView() {
@@ -96,6 +113,8 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
 
 
     override fun getHeartCpData(heartCpBean: HeartCpBean?) {
+        mBinding.smartRefreshLayout.finishRefresh()
+        mBinding.smartRefreshLayout.finishLoadMore()
         if (heartCpBean == null) {
             return
         }
@@ -122,7 +141,11 @@ class HeartCpActivity : BaseMvpActivity<HeartCpPresenter, ActivityHeartCpBinding
             mBinding.tvExperience.text = xd.toString()
         }
 
-        adapter?.setNewData(heartCpBean.gift_log)
+        if (page == 1) {
+            adapter?.setNewData(heartCpBean.gift_log)
+        }else{
+            adapter?.addData(heartCpBean.gift_log)
+        }
 
         val day = TimeUtils.formatDurationDaysOnly(
             heartCpBean.createtime * 1000 - System.currentTimeMillis()

MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/HeartCpContact.kt

@@ -13,7 +13,7 @@ class HeartCpContact {
 
     interface IPre : IPresenter {
 
-        fun getHeartCpData(userId: Int)
+        fun getHeartCpData(userId: Int,page: Int)
     }
 
 }

MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/HeartCpPresenter.kt

@@ -10,8 +10,8 @@ import java.lang.ref.WeakReference
 
 class HeartCpPresenter(val view: HeartCpContact.View, context: Context) :
     BasePresenter<HeartCpContact.View>(view, context), HeartCpContact.IPre {
-    override fun getHeartCpData(userId: Int) {
-        api.getCpRoom(userId.toString(), object : BaseObserver<HeartCpBean>() {
+    override fun getHeartCpData(userId: Int,page:Int) {
+        api.getCpRoom(userId.toString(),page, object : BaseObserver<HeartCpBean>() {
 
             override fun onSubscribe(d: Disposable) {
                 addDisposable(d)