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

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_cp_lv, noCpBean.relation_name)
// holder.setText(R.id.tv_cp_lv, noCpBean.relation_name)
var meHeadView: MeHeadView
var meHeadView2: MeHeadView
meHeadView = holder.getView(R.id.user_nav1)
meHeadView2 = holder.getView(R.id.user_nav2)
meHeadView.setSex(noCpBean.relation_list[0].sex1,noCpBean.relation_list[0].avatar1,noCpBean.relation_list[0].dress1)
meHeadView2.setSex(noCpBean.relation_list[0].sex2,noCpBean.relation_list[0].avatar2,noCpBean.relation_list[0].dress2)
if (noCpBean.relation_list[0].user_id1 == userId.toInt()){
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内容
// 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))
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_dele, true)
} else {
holder.setVisible(R.id.icon_cp_zd, 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 {
@@ -188,7 +210,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
meHeadView=holder.getView(R.id.user_nav1)
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)
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)
}
if (relation2.user_id1== SpUtil.getUserId()){
if (relation2.user_id1==userId.toInt()){
meHeadView2.setSex(relation2.sex2,relation2.avatar2,relation2.dress2)
holder.setText(R.id.tv_nickname2, relation2.nickname2)
}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.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())
}else {
@@ -225,7 +247,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
}
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())
}else{
@@ -251,7 +273,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
meHeadView2=holder.getView(R.id.user_nav2)
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)
holder.setText(R.id.tv_nickname1, relation1.nickname2)
}else{
@@ -259,7 +281,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
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)
holder.setText(R.id.tv_nickname2, relation2.nickname2)
}else{
@@ -267,7 +289,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
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)
holder.setText(R.id.tv_nickname3, relation3.nickname2)
}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.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())
}else {
@@ -302,7 +324,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
}
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())
}else{
@@ -310,7 +332,7 @@ class BosomFriendAdapter(data: MutableList<MultiItemEntity>) : BaseMultiItemQuic
}
}
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())
}else{