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

1:完成挚友功能

Browse Source 
2：添加在送特定礼物展示弹框功能
3：修改部分图片格式变成wedp
4：用户主页添加礼物墙和挚友
This commit is contained in:
梁小江
2025-11-21 18:54:40 +08:00
parent 3c83906870
commit 1dfcf4e98c
249 changed files with 3367 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationBean.kt Normal file
View File

@@ -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"
}
]
}
]
}*/
}

11
BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationshipBean.java
View File

@@ -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;
}
}

84
BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
View File

@@ -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;
}