YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:修改挚友展示不正确

Browse Source 
2：修改歌单显示重复展示
3：修改家族收益上拉刷新展示不全
This commit is contained in:
梁小江
2025-12-10 19:43:43 +08:00
parent 3263fbd7f6
commit e386b072f5
4 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/TotalRevenueActivity.kt
View File

@@ -80,7 +80,7 @@ class TotalRevenueActivity : BaseMvpActivity<UserFamilyPresenter, ActivityTotalR
mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(object : mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(object :
OnRefreshLoadMoreListener { OnRefreshLoadMoreListener {
override fun onRefresh(refreshLayout: RefreshLayout) { override fun onRefresh(refreshLayout: RefreshLayout) {
page++ page = 1 // 重置页码
MvpPre?.familyEarnings( MvpPre?.familyEarnings(
userId.toString(), userId.toString(),
page, page,
@@ -90,7 +90,9 @@ class TotalRevenueActivity : BaseMvpActivity<UserFamilyPresenter, ActivityTotalR
} }
override fun onLoadMore(refreshLayout: RefreshLayout) { override fun onLoadMore(refreshLayout: RefreshLayout) {
page = 1 // 重置页码
page++
MvpPre?.familyEarnings( MvpPre?.familyEarnings(
userId.toString(), userId.toString(),
page, page,
@@ -133,7 +135,6 @@ class TotalRevenueActivity : BaseMvpActivity<UserFamilyPresenter, ActivityTotalR
// 显示没有更多数据的提示 // 显示没有更多数据的提示
// 设置一个特殊的空视图，表示没有更多数据 // 设置一个特殊的空视图，表示没有更多数据
// 重要：page--，因为这次加载没有新数据 // 重要：page--，因为这次加载没有新数据
page--
} }
// 非第一页有数据 // 非第一页有数据
else -> { else -> {

32
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/UserPlaylistActivity.java
View File

@@ -30,7 +30,7 @@ public class UserPlaylistActivity extends BaseMvpActivity<SingerVerificationPres
private int page = 0; private int page = 0;
private UserPlaylistAdapter mAdapter; private UserPlaylistAdapter mAdapter;
private List<SongPlaylist.SongPlaylistBean> mSongPlaylistBean; private List<SongPlaylist.SongPlaylistBean> mSongPlaylistBean = new ArrayList<>();
@Override @Override
protected void initView() { protected void initView() {
@@ -60,7 +60,7 @@ public class UserPlaylistActivity extends BaseMvpActivity<SingerVerificationPres
mBinding.recycleView.setLayoutManager(new LinearLayoutManager(this)); mBinding.recycleView.setLayoutManager(new LinearLayoutManager(this));
// 初始化适配器 // 初始化适配器
mAdapter = new UserPlaylistAdapter(this, new ArrayList<>()); mAdapter = new UserPlaylistAdapter(this, mSongPlaylistBean);
mBinding.recycleView.setAdapter(mAdapter); mBinding.recycleView.setAdapter(mAdapter);
// 设置滑动操作 // 设置滑动操作
// ItemTouchHelper itemTouchHelper = UserPlaylistAdapter.getItemTouchHelper(mAdapter); // ItemTouchHelper itemTouchHelper = UserPlaylistAdapter.getItemTouchHelper(mAdapter);
@@ -146,31 +146,13 @@ public class UserPlaylistActivity extends BaseMvpActivity<SingerVerificationPres
@Override @Override
public void getSong(SongPlaylist s) { public void getSong(SongPlaylist s) {
if (mAdapter != null) { if (s != null) {
if (page == 1) { if (!s.getLists().isEmpty()) {
// 第一页，直接设置数据
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;
}
mSongPlaylistBean.addAll(s.getLists()); mSongPlaylistBean.addAll(s.getLists());
// 更多页面，添加数据 mAdapter.notifyDataSetChanged();
mAdapter.addData(s.getLists()); // 更新歌单数量
mBinding.tvNum.setText("共" + s.getCount() + "首歌");
} }
// 更新歌单数量
mBinding.tvNum.setText("共" + s.getCount() + "首歌");
}
// 结束刷新或加载更多
if (mBinding.smartRefreshLayout != null) {
mBinding.smartRefreshLayout.finishRefresh();
mBinding.smartRefreshLayout.finishLoadMore();
} }
} }

72
MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt
View File

@@ -78,36 +78,58 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
holder.setText(R.id.tv_heartbeat, noCpBean.relation_name) holder.setText(R.id.tv_heartbeat, noCpBean.relation_name)
// 显示关系名称 // 显示关系名称
holder.setText(R.id.tv_cp_lv, noCpBean.relation_name) // holder.setText(R.id.tv_cp_lv, noCpBean.relation_name)
var meHeadView: MeHeadView var meHeadView: MeHeadView
var meHeadView2: MeHeadView var meHeadView2: MeHeadView
meHeadView = holder.getView(R.id.user_nav1) meHeadView = holder.getView(R.id.user_nav1)
meHeadView2 = holder.getView(R.id.user_nav2) meHeadView2 = holder.getView(R.id.user_nav2)
meHeadView.setSex(noCpBean.relation_list[0].sex1,noCpBean.relation_list[0].avatar1,noCpBean.relation_list[0].dress1) if (noCpBean.relation_list[0].user_id1 == userId.toInt()){
meHeadView2.setSex(noCpBean.relation_list[0].sex2,noCpBean.relation_list[0].avatar2,noCpBean.relation_list[0].dress2) meHeadView.setSex(noCpBean.relation_list[0].sex1,noCpBean.relation_list[0].avatar1,noCpBean.relation_list[0].dress1)
holder.setText(R.id.tv_nickname1, noCpBean.relation_list[0].nickname1)
holder.setText(R.id.tv_nickname2, noCpBean.relation_list[0].nickname2)
meHeadView2.setSex(noCpBean.relation_list[0].sex2,noCpBean.relation_list[0].avatar2,noCpBean.relation_list[0].dress2)
}else{
meHeadView.setSex(noCpBean.relation_list[0].sex2,noCpBean.relation_list[0].avatar2,noCpBean.relation_list[0].dress2)
holder.setText(R.id.tv_nickname1, noCpBean.relation_list[0].nickname2)
holder.setText(R.id.tv_nickname2, noCpBean.relation_list[0].nickname1)
meHeadView2.setSex(noCpBean.relation_list[0].sex1,noCpBean.relation_list[0].avatar1,noCpBean.relation_list[0].dress1)
}
// 设置点击事件
holder.getView<View>(R.id.user_nav1).setOnClickListener {
if(noCpBean.relation_list[0].user_id1 == userId.toInt()){
onItemClickListener?.onUserClick(noCpBean.relation_list[0].user_id1.toString())
}else{
onItemClickListener?.onUserClick(noCpBean.relation_list[0].user_id2.toString())
}
// 点击第一个用户头像
}
holder.getView<View>(R.id.user_nav2).setOnClickListener {
// 点击第二个用户头像
// onItemClickListener?.onUserClick(noCpBean.relation_list[0].user_id2.toString())
if(noCpBean.relation_list[0].user_id2 == userId.toInt()){
onItemClickListener?.onUserClick(noCpBean.relation_list[0].user_id2.toString())
}else{
onItemClickListener?.onUserClick(noCpBean.relation_list[0].user_id1.toString())
}
}
// 显示relation_list内容 // 显示relation_list内容
// ImageUtils.loadHead(noCpBean.relation_list[0].avatar1, holder.getView(R.id.user_nav1)) // ImageUtils.loadHead(noCpBean.relation_list[0].avatar1, holder.getView(R.id.user_nav1))
holder.setText(R.id.tv_nickname1, noCpBean.relation_list[0].nickname1)
// ImageUtils.loadHead(noCpBean.relation_list[0].avatar2, holder.getView(R.id.user_nav2)) // ImageUtils.loadHead(noCpBean.relation_list[0].avatar2, holder.getView(R.id.user_nav2))
holder.setText(R.id.tv_nickname2, noCpBean.relation_list[0].nickname2)
if (noCpBean.relation_list[0].user_id1 == SpUtil.getUserId() || noCpBean.relation_list[0].user_id2 == SpUtil.getUserId()) { if (noCpBean.relation_list[0].user_id1 == userId.toInt() || noCpBean.relation_list[0].user_id2 ==userId.toInt()) {
holder.setVisible(R.id.icon_cp_zd, true) holder.setVisible(R.id.icon_cp_zd, true)
holder.setVisible(R.id.icon_cp_dele, true) holder.setVisible(R.id.icon_cp_dele, true)
} else { } else {
holder.setVisible(R.id.icon_cp_zd, false) holder.setVisible(R.id.icon_cp_zd, false)
holder.setVisible(R.id.icon_cp_dele, false) holder.setVisible(R.id.icon_cp_dele, false)
} }
// 设置点击事件
holder.getView<View>(R.id.user_nav1).setOnClickListener {
// 点击第一个用户头像
onItemClickListener?.onUserClick(noCpBean.relation_list[0].user_id1.toString())
}
holder.getView<View>(R.id.user_nav2).setOnClickListener {
// 点击第二个用户头像
onItemClickListener?.onUserClick(noCpBean.relation_list[0].user_id2.toString())
}
// 设置删除按钮点击事件 // 设置删除按钮点击事件
holder.getView<View>(R.id.icon_cp_dele).setOnClickListener { holder.getView<View>(R.id.icon_cp_dele).setOnClickListener {
@@ -188,7 +210,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
meHeadView=holder.getView(R.id.user_nav1) meHeadView=holder.getView(R.id.user_nav1)
meHeadView2=holder.getView(R.id.user_nav2) meHeadView2=holder.getView(R.id.user_nav2)
if (relation1.user_id1== SpUtil.getUserId()){ if (relation1.user_id1== userId.toInt()){
meHeadView.setSex(relation1.sex2,relation1.avatar2,relation1.dress2) meHeadView.setSex(relation1.sex2,relation1.avatar2,relation1.dress2)
holder.setText(R.id.tv_nickname1, relation1.nickname2) holder.setText(R.id.tv_nickname1, relation1.nickname2)
@@ -197,7 +219,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
holder.setText(R.id.tv_nickname1, relation1.nickname1) holder.setText(R.id.tv_nickname1, relation1.nickname1)
} }
if (relation2.user_id1== SpUtil.getUserId()){ if (relation2.user_id1==userId.toInt()){
meHeadView2.setSex(relation2.sex2,relation2.avatar2,relation2.dress2) meHeadView2.setSex(relation2.sex2,relation2.avatar2,relation2.dress2)
holder.setText(R.id.tv_nickname2, relation2.nickname2) holder.setText(R.id.tv_nickname2, relation2.nickname2)
}else{ }else{
@@ -215,7 +237,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
holder.setText(R.id.tv_gx_time2, TimeUtils.formatDurationDaysOnly(noCpBean.relation_list[1].end_time.toLong()* 1000 - System.currentTimeMillis())) holder.setText(R.id.tv_gx_time2, TimeUtils.formatDurationDaysOnly(noCpBean.relation_list[1].end_time.toLong()* 1000 - System.currentTimeMillis()))
holder.getView<View>(R.id.user_nav1).setOnClickListener { holder.getView<View>(R.id.user_nav1).setOnClickListener {
if (relation1.user_id1== SpUtil.getUserId()){ if (relation1.user_id1== userId.toInt()){
// 点击第一个用户头像 // 点击第一个用户头像
onItemClickListener?.onUserClick(relation1.user_id2.toString()) onItemClickListener?.onUserClick(relation1.user_id2.toString())
}else { }else {
@@ -225,7 +247,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
} }
holder.getView<View>(R.id.user_nav2).setOnClickListener { holder.getView<View>(R.id.user_nav2).setOnClickListener {
if (relation2.user_id1== SpUtil.getUserId()) { if (relation2.user_id1== userId.toInt()) {
// 点击第二个用户头像 // 点击第二个用户头像
onItemClickListener?.onUserClick(relation2.user_id2.toString()) onItemClickListener?.onUserClick(relation2.user_id2.toString())
}else{ }else{
@@ -251,7 +273,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
meHeadView2=holder.getView(R.id.user_nav2) meHeadView2=holder.getView(R.id.user_nav2)
meHeadView3=holder.getView(R.id.user_nav3) meHeadView3=holder.getView(R.id.user_nav3)
if (relation1.user_id1== SpUtil.getUserId()){ if (relation1.user_id1== userId.toInt()){
meHeadView.setSex(relation1.sex2,relation1.avatar2,relation1.dress2) meHeadView.setSex(relation1.sex2,relation1.avatar2,relation1.dress2)
holder.setText(R.id.tv_nickname1, relation1.nickname2) holder.setText(R.id.tv_nickname1, relation1.nickname2)
}else{ }else{
@@ -259,7 +281,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
holder.setText(R.id.tv_nickname1, relation1.nickname1) holder.setText(R.id.tv_nickname1, relation1.nickname1)
} }
if (relation2.user_id1== SpUtil.getUserId()){ if (relation2.user_id1== userId.toInt()){
meHeadView2.setSex(relation2.sex2,relation2.avatar2,relation2.dress2) meHeadView2.setSex(relation2.sex2,relation2.avatar2,relation2.dress2)
holder.setText(R.id.tv_nickname2, relation2.nickname2) holder.setText(R.id.tv_nickname2, relation2.nickname2)
}else{ }else{
@@ -267,7 +289,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
holder.setText(R.id.tv_nickname2, relation2.nickname1) holder.setText(R.id.tv_nickname2, relation2.nickname1)
} }
if (relation3.user_id1== SpUtil.getUserId()){ if (relation3.user_id1==userId.toInt()){
meHeadView3.setSex(relation3.sex2,relation3.avatar2,relation3.dress2) meHeadView3.setSex(relation3.sex2,relation3.avatar2,relation3.dress2)
holder.setText(R.id.tv_nickname3, relation3.nickname2) holder.setText(R.id.tv_nickname3, relation3.nickname2)
}else{ }else{
@@ -292,7 +314,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
holder.setText(R.id.tv_gx_time3, TimeUtils.formatDurationDaysOnly(noCpBean.relation_list[2].end_time.toLong()* 1000 - System.currentTimeMillis())) holder.setText(R.id.tv_gx_time3, TimeUtils.formatDurationDaysOnly(noCpBean.relation_list[2].end_time.toLong()* 1000 - System.currentTimeMillis()))
holder.getView<View>(R.id.user_nav1).setOnClickListener { holder.getView<View>(R.id.user_nav1).setOnClickListener {
if (relation1.user_id1== SpUtil.getUserId()){ if (relation1.user_id1== userId.toInt()){
// 点击第一个用户头像 // 点击第一个用户头像
onItemClickListener?.onUserClick(relation1.user_id2.toString()) onItemClickListener?.onUserClick(relation1.user_id2.toString())
}else { }else {
@@ -302,7 +324,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
} }
holder.getView<View>(R.id.user_nav2).setOnClickListener { holder.getView<View>(R.id.user_nav2).setOnClickListener {
if (relation2.user_id1== SpUtil.getUserId()) { if (relation2.user_id1== userId.toInt()) {
// 点击第二个用户头像 // 点击第二个用户头像
onItemClickListener?.onUserClick(relation2.user_id2.toString()) onItemClickListener?.onUserClick(relation2.user_id2.toString())
}else{ }else{
@@ -310,7 +332,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
} }
} }
holder.getView<View>(R.id.user_nav3).setOnClickListener { holder.getView<View>(R.id.user_nav3).setOnClickListener {
if (relation3.user_id1== SpUtil.getUserId()) { if (relation3.user_id1==userId.toInt()) {
// 点击第三个用户头像 // 点击第三个用户头像
onItemClickListener?.onUserClick(relation3.user_id2.toString()) onItemClickListener?.onUserClick(relation3.user_id2.toString())
}else{ }else{

2
MainModule/src/main/res/layout/fragment_bosom_friend.xml
View File

@@ -232,7 +232,7 @@
android:layout_marginTop="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16"
android:background="@mipmap/bj_heartbeat_ts" android:background="@mipmap/bj_heartbeat_ts"
android:gravity="center" android:gravity="center"
android:text="暂无关系，前往房间互送特殊礼物打成关系吧" android:text="暂无关系，前往房间互送特殊礼物达成关系吧"
android:textColor="#624E79" android:textColor="#624E79"
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:visibility="visible" android:visibility="visible"