From af8b87dd471d7fdf63913ea7d1c223b3b1b7fa87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Sat, 22 Nov 2025 09:23:32 +0800 Subject: [PATCH] =?UTF-8?q?1:=E6=8C=9A=E5=8F=8B=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=B4=E5=83=8F=E6=A1=86=E5=B1=95=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=BF=94=E5=9B=9E=E5=B0=B1=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=B8=8D=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moduleutil/bean/RelationshipBean.java | 3 +++ .../com/xscm/moduleutil/utils/MeHeadView.java | 8 ++++++- .../modulemain/adapter/BosomFriendAdapter.kt | 24 +++++++++---------- .../adapter/RelationshipAdapter.java | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationshipBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationshipBean.java index 574708d4..cc0a6447 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationshipBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationshipBean.java @@ -35,6 +35,9 @@ public class RelationshipBean implements Serializable, MultiItemEntity { private int type;// 1,亲密；2：真爱 private int sex1;//1：女 2：男 private int sex2;// + private String dress1;// + private String dress2;// + @Override public int getItemType() { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java index 258bff87..a13b5d0b 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java @@ -73,10 +73,16 @@ public class MeHeadView extends ConstraintLayout { mIvOnline.setImageResource(isOnline ? R.mipmap.me_online_icon : R.mipmap.me_icon_unchecked); } - public void setSex(int sex,String headPicture) { + public void setSex(int sex,String headPicture,String dress) { if (!TextUtils.isEmpty(headPicture)) { ImageUtils.loadHead(headPicture, mRiv); } + if (TextUtils.isEmpty(dress)) { + mIvFrame.setVisibility(GONE); + } else { + mIvFrame.setVisibility(VISIBLE); + mIvFrame.setSource(dress, 1); + } mIvSex.setVisibility(VISIBLE); mIvSex.setImageResource(sex == 1 ? R.mipmap.nan : R.mipmap.nv); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt b/MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt index 1788522f..56e9bd99 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/BosomFriendAdapter.kt @@ -82,8 +82,8 @@ class BosomFriendAdapter(data: MutableList) : BaseMultiItemQuic 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) - meHeadView2.setSex(noCpBean.relation_list[0].sex2,noCpBean.relation_list[0].avatar2) + 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) // 显示relation_list内容 // ImageUtils.loadHead(noCpBean.relation_list[0].avatar1, holder.getView(R.id.user_nav1)) @@ -178,19 +178,19 @@ class BosomFriendAdapter(data: MutableList) : BaseMultiItemQuic meHeadView2=holder.getView(R.id.user_nav2) if (relation1.user_id1== SpUtil.getUserId()){ - meHeadView.setSex(relation1.sex2,relation1.avatar2) + meHeadView.setSex(relation1.sex2,relation1.avatar2,relation1.dress2) holder.setText(R.id.tv_nickname1, relation1.nickname2) }else{ - meHeadView.setSex(relation1.sex1,relation1.avatar1) + meHeadView.setSex(relation1.sex1,relation1.avatar1,relation1.dress1) holder.setText(R.id.tv_nickname1, relation1.nickname1) } if (relation2.user_id1== SpUtil.getUserId()){ - meHeadView2.setSex(relation2.sex2,relation2.avatar2) + meHeadView2.setSex(relation2.sex2,relation2.avatar2,relation2.dress2) holder.setText(R.id.tv_nickname2, relation2.nickname2) }else{ - meHeadView2.setSex(relation2.sex1,relation2.avatar1) + meHeadView2.setSex(relation2.sex1,relation2.avatar1,relation2.dress1) holder.setText(R.id.tv_nickname2, relation2.nickname1) } @@ -241,26 +241,26 @@ class BosomFriendAdapter(data: MutableList) : BaseMultiItemQuic meHeadView3=holder.getView(R.id.user_nav3) if (relation1.user_id1== SpUtil.getUserId()){ - meHeadView.setSex(relation1.sex2,relation1.avatar2) + meHeadView.setSex(relation1.sex2,relation1.avatar2,relation1.dress2) holder.setText(R.id.tv_nickname1, relation1.nickname2) }else{ - meHeadView.setSex(relation1.sex1,relation1.avatar1) + meHeadView.setSex(relation1.sex1,relation1.avatar1,relation1.dress1) holder.setText(R.id.tv_nickname1, relation1.nickname1) } if (relation2.user_id1== SpUtil.getUserId()){ - meHeadView2.setSex(relation2.sex2,relation2.avatar2) + meHeadView2.setSex(relation2.sex2,relation2.avatar2,relation2.dress2) holder.setText(R.id.tv_nickname2, relation2.nickname2) }else{ - meHeadView2.setSex(relation2.sex1,relation2.avatar1) + meHeadView2.setSex(relation2.sex1,relation2.avatar1,relation2.dress1) holder.setText(R.id.tv_nickname2, relation2.nickname1) } if (relation3.user_id1== SpUtil.getUserId()){ - meHeadView3.setSex(relation3.sex2,relation3.avatar2) + meHeadView3.setSex(relation3.sex2,relation3.avatar2,relation3.dress2) holder.setText(R.id.tv_nickname3, relation3.nickname2) }else{ - meHeadView3.setSex(relation3.sex1,relation3.avatar1) + meHeadView3.setSex(relation3.sex1,relation3.avatar1,relation3.dress1) holder.setText(R.id.tv_nickname3, relation3.nickname1) } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/RelationshipAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/RelationshipAdapter.java index b92e3570..749e050b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/RelationshipAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/RelationshipAdapter.java @@ -29,9 +29,9 @@ public class RelationshipAdapter extends BaseQuickAdapter