1:修改挚友展示不正确
2:修改歌单显示重复展示 3:修改家族收益上拉刷新展示不全
This commit is contained in:
@@ -80,7 +80,7 @@ class TotalRevenueActivity : BaseMvpActivity<UserFamilyPresenter, ActivityTotalR
|
||||
mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(object :
|
||||
OnRefreshLoadMoreListener {
|
||||
override fun onRefresh(refreshLayout: RefreshLayout) {
|
||||
page++
|
||||
page = 1 // 重置页码
|
||||
MvpPre?.familyEarnings(
|
||||
userId.toString(),
|
||||
page,
|
||||
@@ -90,7 +90,9 @@ class TotalRevenueActivity : BaseMvpActivity<UserFamilyPresenter, ActivityTotalR
|
||||
}
|
||||
|
||||
override fun onLoadMore(refreshLayout: RefreshLayout) {
|
||||
page = 1 // 重置页码
|
||||
|
||||
|
||||
page++
|
||||
MvpPre?.familyEarnings(
|
||||
userId.toString(),
|
||||
page,
|
||||
@@ -133,7 +135,6 @@ class TotalRevenueActivity : BaseMvpActivity<UserFamilyPresenter, ActivityTotalR
|
||||
// 显示没有更多数据的提示
|
||||
// 设置一个特殊的空视图,表示没有更多数据
|
||||
// 重要:page--,因为这次加载没有新数据
|
||||
page--
|
||||
}
|
||||
// 非第一页有数据
|
||||
else -> {
|
||||
|
||||
@@ -30,7 +30,7 @@ public class UserPlaylistActivity extends BaseMvpActivity<SingerVerificationPres
|
||||
|
||||
private int page = 0;
|
||||
private UserPlaylistAdapter mAdapter;
|
||||
private List<SongPlaylist.SongPlaylistBean> mSongPlaylistBean;
|
||||
private List<SongPlaylist.SongPlaylistBean> mSongPlaylistBean = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
protected void initView() {
|
||||
@@ -60,7 +60,7 @@ public class UserPlaylistActivity extends BaseMvpActivity<SingerVerificationPres
|
||||
mBinding.recycleView.setLayoutManager(new LinearLayoutManager(this));
|
||||
|
||||
// 初始化适配器
|
||||
mAdapter = new UserPlaylistAdapter(this, new ArrayList<>());
|
||||
mAdapter = new UserPlaylistAdapter(this, mSongPlaylistBean);
|
||||
mBinding.recycleView.setAdapter(mAdapter);
|
||||
// 设置滑动操作
|
||||
// ItemTouchHelper itemTouchHelper = UserPlaylistAdapter.getItemTouchHelper(mAdapter);
|
||||
@@ -146,31 +146,13 @@ public class UserPlaylistActivity extends BaseMvpActivity<SingerVerificationPres
|
||||
|
||||
@Override
|
||||
public void getSong(SongPlaylist s) {
|
||||
if (mAdapter != null) {
|
||||
if (page == 1) {
|
||||
// 第一页,直接设置数据
|
||||
if (s == null || s.getLists() == null || s.getLists().size() == 0) {
|
||||
return;
|
||||
}
|
||||
mSongPlaylistBean = s.getLists();
|
||||
mAdapter.setNewData(s.getLists());
|
||||
} else {
|
||||
if (s == null || s.getLists() == null || s.getLists().size() == 0) {
|
||||
return;
|
||||
}
|
||||
if (s != null) {
|
||||
if (!s.getLists().isEmpty()) {
|
||||
mSongPlaylistBean.addAll(s.getLists());
|
||||
// 更多页面,添加数据
|
||||
mAdapter.addData(s.getLists());
|
||||
mAdapter.notifyDataSetChanged();
|
||||
// 更新歌单数量
|
||||
mBinding.tvNum.setText("共" + s.getCount() + "首歌");
|
||||
}
|
||||
|
||||
// 更新歌单数量
|
||||
mBinding.tvNum.setText("共" + s.getCount() + "首歌");
|
||||
}
|
||||
|
||||
// 结束刷新或加载更多
|
||||
if (mBinding.smartRefreshLayout != null) {
|
||||
mBinding.smartRefreshLayout.finishRefresh();
|
||||
mBinding.smartRefreshLayout.finishLoadMore();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user