1:完成挚友功能

2：添加在送特定礼物展示弹框功能
3：修改部分图片格式变成wedp
4：用户主页添加礼物墙和挚友

BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationBean.kt

@@ -0,0 +1,73 @@
+package com.xscm.moduleutil.bean
+
+import com.chad.library.adapter.base.entity.MultiItemEntity
+import lombok.Data
+import java.util.ArrayList
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/11/20 15:13
+ * 用途：心动空间中的关系实体
+ */
+@Data
+class RelationBean : MultiItemEntity {
+
+    var cp: UserInfo.CpInfo = UserInfo.CpInfo()
+    var no_cp: List<NoCpBean> = ArrayList()
+    override fun getItemType(): Int {
+
+        // 情况3：no_cp集合，relation_name不等于""，并且relation_list的大小是1
+        if (no_cp.isNotEmpty() && no_cp[0].relation_name.isNotEmpty() && no_cp[0].relation_list.size == 1) {
+            return 3
+        }
+
+        // 情况4：no_cp集合，relation_list的大小是1
+        if (no_cp.isNotEmpty() && no_cp[0].relation_list.size == 1) {
+            return 4
+        }
+
+        if (no_cp.isNotEmpty() && no_cp[0].relation_name.isNotEmpty() && no_cp[0].relation_list.size > 1){
+            return 5
+        }
+
+        // 其他情况返回5
+        return 6
+    }
+
+    class NoCpBean : MultiItemEntity{
+        var relation_name: String = ""
+        var relation_list: List<RelationshipBean> = ArrayList()
+    override fun getItemType(): Int {
+        return 0
+    }
+
+}
+
+
+    /*"cp": [
+    {
+        "relation_name": "string",
+        "relation_list": [
+        {
+            "nickname1": "string",
+            "avatar1": "string",
+            "user_id1": "string"
+        }
+        ]
+    }
+    ],
+    "no_cp": [
+    {
+        "relation_name": "string",
+        "relation_list": [
+        {
+            "user_info1": {},
+            "user_info2": "string",
+            "level": "string",
+            "exp": "string"
+        }
+        ]
+    }
+    ]
+}*/
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationshipBean.java

@@ -1,5 +1,7 @@
 package com.xscm.moduleutil.bean;
 
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+
 import java.io.Serializable;
 
 import lombok.Data;
@@ -10,7 +12,7 @@ import lombok.Data;
  * @description: 关系信息
  */
 @Data
-public class RelationshipBean implements Serializable {
+public class RelationshipBean implements Serializable, MultiItemEntity {
 
 
     private int relation_id;//关系id 3,
@@ -31,4 +33,11 @@ public class RelationshipBean implements Serializable {
     private int heart_value;// 0,
     private int is_top;// 0
     private int type;// 1,亲密；2：真爱
+    private int sex1;//1：女 2：男
+    private int sex2;//
+
+    @Override
+    public int getItemType() {
+        return 0;
+    }
 }

BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java

@@ -1,5 +1,6 @@
 package com.xscm.moduleutil.bean;
 
+import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.google.gson.annotations.SerializedName;
 import com.xscm.moduleutil.BaseEvent;
 import com.xscm.moduleutil.bean.room.FriendInfo;
@@ -11,9 +12,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- *@author qx
- *@data 2025/6/3
- *@description: 个人信息，点击我的获取
+ * @author qx
+ * @data 2025/6/3
+ * @description: 个人信息，点击我的获取
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -38,7 +39,7 @@ public class UserInfo extends BaseEvent implements Serializable {
     private int is_in_pit;//是否在麦上，1在0不在
     private int is_open_live_remind;//是否设置开播提醒
     private String birthday;//生日
-    private String profile;//简介
+    private String profile = "";//简介
     private String home_bgimages;//背景图片
     private int is_follow;//是否关注
     private List<UserTagBean> tag_list;
@@ -76,46 +77,64 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String nickname_color = "";//昵称颜色
     private String mic_cycle;//麦圈
     private String is_hide;//0不能设置，1：可以设置
-    private String  hide_status;//0-取消隐身，1-设置隐身
+    private String hide_status;//0-取消隐身，1-设置隐身
 
     private String enter_image;//爵位飘屏的背景
     private String enter_text;//爵位飘屏的文字
     private int singer_status;//歌手认证状态0-待审核，1-通过，2-拒绝 -1：未认证
     private int singer_level;//歌手等级
-    private CpInfo cp_info ;
+    private CpInfo cp_info;
 
 
-      /*"cp_info": {
-        "name": "string",
-                "user_id1": "string",
-                "user_id2": "string",
-                "level": "string",
-                "exp": "string",
-                "pendant": "string",
-                "direction": "string",
+    /*"cp_info": {
+      "name": "string",
+              "user_id1": "string",
+              "user_id2": "string",
+              "level": "string",
+              "exp": "string",
+              "pendant": "string",
+              "direction": "string",
 
-    }*/
-    public static class CpInfo implements Serializable{
-          public String name;
-          public String level;
-          public String exp;
-          public String pendant;
-          public String direction;
-          public UserInfo1 user_info1;
-          public UserInfo2 user_info2;
+  }*/
 
-        public static class UserInfo1 implements Serializable{
+    @Data
+    public static class CpInfo implements Serializable, MultiItemEntity {
+        private int id;
+        private int user_id1;
+        private int user_id2;
+        private int status;
+
+        private long createtime;
+
+        public String name;
+        public String level;
+        public String exp;
+        public String pendant;
+        public String direction;
+        public UserInfo1 user_info1;
+        public UserInfo2 user_info2;
+
+        @Override
+        public int getItemType() {
+            if(!name.isEmpty()) {
+                return 1;
+            }
+            return 2;
+        }
+
+        @Data
+        public static class UserInfo1 implements Serializable {
             public String user_id;
             public String nickname;
             public String avatar;
             public String dress;
         }
-
-          public static class UserInfo2 implements Serializable{
-              public String user_id;
-              public String nickname;
-              public String avatar;
-              public String dress;
+        @Data
+        public static class UserInfo2 implements Serializable {
+            public String user_id;
+            public String nickname;
+            public String avatar;
+            public String dress;
         }
          /*"user_info1": {
               "user_id": "string",
@@ -138,13 +157,14 @@ public class UserInfo extends BaseEvent implements Serializable {
 //        private String tag_name;
 //    }
     @Data
-    public static class  GiftWall implements Serializable{
+    public static class GiftWall implements Serializable {
         private String gift_name;
         private String total;
 
         private List<SendUserInfo> send_user_info;
+
         @Data
-        public static class  SendUserInfo implements Serializable{
+        public static class SendUserInfo implements Serializable {
             private String nickname;
             private String avatar;
         }

BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java

@@ -385,6 +385,10 @@ public interface ApiServer {
     Call<BaseModel<String>> commentZone(@Field("id") String id, @Field("content") String content, @Field("pid") String pid, @Field("reply_to") String reply_to);
 
 
+    @FormUrlEncoded
+    @POST(Constants.POST_FRIEND_LIST)
+    Call<BaseModel<RelationBean>> getFriendList(@Field("user_id") String user_id, @Field("page") String page, @Field("page_limit") String page_limit);
+
     @GET(Constants.GET_MY_CP_ROOM_LIST)
     Call<BaseModel<List<MyCpRoom>>> myCpRoom();
 
@@ -754,6 +758,10 @@ public interface ApiServer {
     @POST(Constants.POST_QUIT_ROOM)
     Call<ResponseBody> quitRoom(@Field("room_id") String room_id, @Field("user_id") String user_id);
 
+    @FormUrlEncoded
+    @POST(Constants.POST_FRIEND_LIST_MORE)
+    Call<BaseModel<List<RelationshipBean>>> getFriendListMore(@Field("user_id") String user_id, @Field("relation_id") String relation_id);
+
     @FormUrlEncoded
     @POST(Constants.POST_RELATION_CARD)
     Call<BaseModel<RelationCardBean>> relationCard(@Field("user_id") String user_id);

BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java

@@ -3595,6 +3595,35 @@ public class RetrofitClient {
         });
     }
 
+    public void getFriendListMore(String user_id,String relation_id,BaseObserver<List<RelationshipBean>> observer){
+        sApiServer.getFriendListMore(user_id,relation_id).enqueue(new Callback<BaseModel<List<RelationshipBean>>>() {
+
+            @Override
+            public void onResponse(Call<BaseModel<List<RelationshipBean>>> call, Response<BaseModel<List<RelationshipBean>>> response) {
+                if (response.code()==200){
+                    BaseModel<List<RelationshipBean>> baseModel = response.body();
+                    if (baseModel.getCode()==1) {
+                        observer.onNext(baseModel.getData());
+                    }else if (baseModel.getCode()==301){
+                        try {
+                            ToastUtils.showShort(baseModel.getMsg());
+                            CommonAppContext.getInstance().clearLoginInfo();
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }else {
+                        ToastUtils.showShort(baseModel.getMsg());
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<List<RelationshipBean>>> call, Throwable t) {
+                LogUtils.e("getFriendListMore",t.toString());
+            }
+        });
+    }
+
     public void checkTxt(String room_name, String room_cover, String
             room_intro, BaseObserver<String> observer) {
         sApiServer.checkTxt(room_name, room_cover, room_intro).enqueue(new Callback<ResponseBody>() {
@@ -3712,8 +3741,7 @@ public class RetrofitClient {
         });
     }
 
-    public void commentZone(String id, String content, String pid, String
-            reply_to, BaseObserver<String> observer) {
+    public void commentZone(String id, String content, String pid, String reply_to, BaseObserver<String> observer) {
         sApiServer.commentZone(id, content, pid, reply_to).enqueue(new Callback<BaseModel<String>>() {
             @Override
             public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
@@ -3727,6 +3755,34 @@ public class RetrofitClient {
         });
     }
 
+    public void getFriendList(String userId,String page,String page_limit,BaseObserver<RelationBean> observer) {
+        sApiServer.getFriendList(userId, page, page_limit).enqueue(new Callback<BaseModel<RelationBean>>() {
+            @Override
+            public void onResponse(Call<BaseModel<RelationBean>> call, Response<BaseModel<RelationBean>> response) {
+                if (response.code()==200){
+                    BaseModel<RelationBean> body = response.body();
+                    if (body.getCode()==1){
+                        observer.onNext(body.getData());
+                    }else if (body.getCode()==301){
+                        try {
+                            ToastUtils.showShort(body.getMsg());
+                            CommonAppContext.getInstance().clearLoginInfo();
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }else {
+                        ToastUtils.showShort(body.getMsg());
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<BaseModel<RelationBean>> call, Throwable t) {
+                LogUtils.e("getFriendList",t.fillInStackTrace());
+            }
+        });
+    }
+
 
     public void clearLoginInfo(BaseObserver<String> observer) {
         sApiServer.clearLoginInfo(SpUtil.getToken()).enqueue(new Callback<BaseModel<String>>() {

BaseModule/src/main/java/com/xscm/moduleutil/utils/MeHeadView.java

@@ -72,4 +72,12 @@ public class MeHeadView extends ConstraintLayout {
         mIvOnline.setVisibility(VISIBLE);
         mIvOnline.setImageResource(isOnline ? R.mipmap.me_online_icon : R.mipmap.me_icon_unchecked);
     }
+
+    public void setSex(int sex,String headPicture) {
+        if (!TextUtils.isEmpty(headPicture)) {
+            ImageUtils.loadHead(headPicture, mRiv);
+        }
+        mIvSex.setVisibility(VISIBLE);
+        mIvSex.setImageResource(sex == 1 ? R.mipmap.nan : R.mipmap.nv);
+    }
 }

BaseModule/src/main/java/com/xscm/moduleutil/utils/TimeUtils.java

@@ -237,4 +237,25 @@ public class TimeUtils {
 
         return sb.toString().trim();
     }
+
+    /**
+     * 格式化时长（毫秒），只返回天数部分。
+     * 例如：输入 90000000 (90,000秒，即1天多)，返回 "1天"
+     *
+     * @param durationMs 时长，单位为毫秒
+     * @return 格式化后的天数字符串，如 "1天"，如果不足一天则返回空字符串 ""
+     */
+    public static String formatDurationDaysOnly(long durationMs) {
+        long totalSeconds = durationMs / 1000;
+        long days = totalSeconds / 86400;
+
+        // 如果天数大于0，则构建返回字符串
+        if (days > 0) {
+            return days + "天";
+        }
+
+        // 如果天数不足1天，根据需求可以返回空字符串，也可以返回 "0天" 或其他
+        return ""; // 或者 return "0天";
+    }
+
 }

BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java

@@ -422,6 +422,8 @@ public class Constants {
     public static final String POST_SINGER_ADD_SONG = "/api/SingerSong/singerAddSong";//歌手添加歌曲
     public static final String POST_SINGER_DELETE_SONG = "/api/SingerSong/singerDelSong";//歌手删除 歌曲
     public static final String POST_SINGER_UPDATE_SONG = "/api/SingerSong/singerEditSong";//歌手修改歌曲
+    public static final String POST_FRIEND_LIST = "/api/User/get_friend_list";//挚友列表
+    public static final String POST_FRIEND_LIST_MORE = "/api/User/get_friend_list_more";//挚友列表查看更多
     public static final String POST_SEND_LOG = "api/Report/android_log_report";//上传log信息
 
 

BaseModule/src/main/res/drawable/bg_r48_ff8acc.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_48" />
+    <solid android:color="#FF8ACC" />
+</shape>

BaseModule/src/main/res/layout/me_view_decoration_head.xml

@@ -43,7 +43,8 @@
         app:layout_constraintWidth_percent="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="gone"/>
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
@@ -61,7 +62,8 @@
         app:layout_constraintHeight_default="spread"
         app:layout_constraintTop_toTopOf="@+id/guideline"
         app:layout_constraintWidth_default="spread"
-        tools:src="@mipmap/me_sj" />
+        tools:src="@mipmap/me_sj"
+        android:visibility="gone"/>
 
     <ImageView
         android:id="@+id/iv_online"