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

1:完成我的家族功能

Browse Source
This commit is contained in:
梁小江
2025-11-28 09:13:08 +08:00
parent 7821ef304d
commit c216099173
27 changed files with 1069 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
BaseModule/src/main/java/com/xscm/moduleutil/bean/FamilyEarnings.kt Normal file
View File

@@ -0,0 +1,34 @@
package com.xscm.moduleutil.bean
/**
* 项目名称：羽声语音
* 时间：2025/11/27 16:47
* 用途：
*/
class FamilyEarnings {
var id: Int=0
var nickname: String=""
var avatar: String=""
var user_code: String=""
var earnings: String=""
var createtime: Long=0
var gift_name: String=""
var gift_price: String=""
/* id 列表 id
nickname 用户昵称
avatar
user_code
earnings 收益
createtime
gift_name 礼物名称
gift_price 礼物价格*/
}

2
BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java
View File

@@ -40,6 +40,7 @@ public class GiftBoxBean {
private List<DailyTasksBean> daily_tasks;
private List<DailyTasksBean> daily_tasks_special;
private List<DailyTasksBean> usual_tasks;
private List<DailyTasksBean> teacher_tasks;
@Data
public static class DailyTasksBean {
@@ -54,6 +55,7 @@ public class GiftBoxBean {
private int processing_type;//跳转状态：
private String processing_type_str;//跳转状态
private String from_id;
private int reward_type;//1：金币 2：钻石
}
}

93
BaseModule/src/main/java/com/xscm/moduleutil/bean/MyFamilyBean.kt Normal file
View File

@@ -0,0 +1,93 @@
package com.xscm.moduleutil.bean
/**
* 项目名称：羽声语音
* 时间：2025/11/26 18:45
* 用途：
*/
class MyFamilyBean {
var group_id: String = "" //群组id
var name: String = "" //家族名称
var user_id: Int = 0 //族长id
var group_members_num: Int = 0 //签约次数 群组人数
var group_earnings: String = "" //总计收益
var group_owner_info: GroupOwnerInfoBean? = null //族长信息
class GroupOwnerInfoBean {
var nickname: String = "" //昵称
var avatar: String = "" //头像
var dress: String = "" //头像框
var user_code: String = "" //用户id
var icon: List<String> = arrayListOf()
var mic_cycle: String = "" //麦圈
var nobility_image: String = "" //贵族
var nickname_color: String = "" //贵族颜色
}
var group_members_lists: List<GroupMembersListsBean> = arrayListOf() //
class GroupMembersListsBean{
var market_value: String = "" //身价
var nickname: String = ""
var avatar: String = ""
var user_code: String = ""
var user_id: Int = 0
var end_time: Long = 0 //签约到期时间点
var dress: String = ""
var icon: List<String> = arrayListOf()
var mic_cycle: String = "" //麦圈
var nobility_image: String = "" //贵族
var nickname_color: String = "" //贵族颜色
var free_renewal: String = "" //免费续签次数
var today_earnings: String = "" //今日收礼收益
var yesterday_earnings: String = "" //昨日收礼收益
var is_online: Int = 0 //是否在线 1在线 0离线
var is_show_sign: Int = 0 //是否显示续约按钮 1：显示 0：不显示
var sign_times: Int = 0 //非首签签约时长
var sign_user_ratio : Int = 0 //非首签签约比例
var end_day: String = "" //签约剩余时长
}
/* "group_id": "string",
"name": "string",
"user_id": "string",
"group_members_num": "string",
"group_earnings": "string",
"group_owner_info": {
"nickname": "string",
"avatar": "string",
"dress": "string",
"user_code": "string",
"icon": [
"string"
],
"mic_cycle": "string",
"nobility_image": "string",
"nickname_color": "string"
},
"group_members_lists": [
{
"market_value": "string",
"nickname": "string",
"avatar": "string",
"user_code": "string",
"user_id": "string",
"end_time": "string",
"dress": "string",
"icon": [
"string"
],
"mic_cycle": "string",
"nobility_image": "string",
"nickname_color": "string",
"free_renewal": "string",
"today_earnings": "string",
"yesterday_earnings": "string"
}
]
}*/
}

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

@@ -84,7 +84,7 @@ public class UserInfo extends BaseEvent implements Serializable {
private int singer_status;//歌手认证状态0-待审核，1-通过，2-拒绝 -1：未认证
private int singer_level;//歌手等级
private CpInfo cp_info;
private int market_value;//身价
/*"cp_info": {
"name": "string",
@@ -116,7 +116,7 @@ public class UserInfo extends BaseEvent implements Serializable {
@Override
public int getItemType() {
if(!name.isEmpty()) {
if (!name.isEmpty()) {
return 1;
}
return 2;
@@ -129,6 +129,7 @@ public class UserInfo extends BaseEvent implements Serializable {
public String avatar;
public String dress;
}
@Data
public static class UserInfo2 implements Serializable {
public String user_id;

11
BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
View File

@@ -859,4 +859,15 @@ public interface ApiServer {
@GET(Constants.GET_CP_ZONE)
Call<BaseModel<HeartCpBean>> getCpRoom(@Query("user_id") String userId);
@GET(Constants.POST_MY_FAMILY)
Call<BaseModel<MyFamilyBean>> myFamily();
@GET(Constants.POST_MY_JOIN_FAMILY)
Call<BaseModel<MyFamilyBean>> myJoinFamily();
@FormUrlEncoded
@POST(Constants.POST_FAMILY_EARNINGS)
Call<BaseModel<List<FamilyEarnings>>> familyEarnings( @Field("user_id") String user_id,@Field("page") int page,@Field("start_time") String start_time,@Field("end_time") String end_time);
}

88
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -4194,8 +4194,7 @@ public class RetrofitClient {
});
}
public void onNextRetu
(Response<BaseModel<String>> response, BaseObserver<String> observer) {
public void onNextRetu(Response<BaseModel<String>> response, BaseObserver<String> observer) {
if (response.code() == 200) {
BaseModel<String> string = response.body();
if (string != null) {
@@ -4582,5 +4581,90 @@ public class RetrofitClient {
});
}
public void myFamily(int type,BaseObserver<MyFamilyBean> observer) {
if (type==1) {
sApiServer.myFamily().enqueue(new Callback<BaseModel<MyFamilyBean>>() {
@Override
public void onResponse(Call<BaseModel<MyFamilyBean>> call, Response<BaseModel<MyFamilyBean>> response) {
if (response.code() == 200) {
BaseModel<MyFamilyBean> baseModel = response.body();
if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()!=null ? baseModel.getData() : new MyFamilyBean());
} else if (baseModel.getCode() == 301) {
try {
ToastUtils.showShort(baseModel.getMsg());
CommonAppContext.getInstance().clearLoginInfo();
} catch (ClassNotFoundException e) {
}
} else {
ToastUtils.showLong(baseModel.getMsg());
}
}
}
@Override
public void onFailure(Call<BaseModel<MyFamilyBean>> call, Throwable t) {
LogUtils.e("myFamily", t.fillInStackTrace());
}
});
}else {
sApiServer.myJoinFamily().enqueue(new Callback<BaseModel<MyFamilyBean>>() {
@Override
public void onResponse(Call<BaseModel<MyFamilyBean>> call, Response<BaseModel<MyFamilyBean>> response) {
if (response.code() == 200) {
BaseModel<MyFamilyBean> baseModel = response.body();
if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()!=null ? baseModel.getData() : new MyFamilyBean());
} else if (baseModel.getCode() == 301) {
try {
ToastUtils.showShort(baseModel.getMsg());
CommonAppContext.getInstance().clearLoginInfo();
} catch (ClassNotFoundException e) {
}
} else {
observer.onNext(new MyFamilyBean());
ToastUtils.showLong(baseModel.getMsg());
}
}
}
@Override
public void onFailure(Call<BaseModel<MyFamilyBean>> call, Throwable t) {
LogUtils.e("myJoinFamily", t.fillInStackTrace());
}
});
}
}
public void familyEarnings(String user_id,int page,String start_time,String end_time,BaseObserver<List<FamilyEarnings>> observer) {
sApiServer.familyEarnings(user_id,page,start_time,end_time).enqueue(new Callback<BaseModel<List<FamilyEarnings>>>() {
@Override
public void onResponse(Call<BaseModel<List<FamilyEarnings>>> call, Response<BaseModel<List<FamilyEarnings>>> response) {
if (response.code() == 200) {
BaseModel<List<FamilyEarnings>> baseModel = response.body();
if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()!=null?baseModel.getData():new ArrayList<FamilyEarnings>());
} else if (baseModel.getCode() == 301) {
try {
ToastUtils.showShort(baseModel.getMsg());
CommonAppContext.getInstance().clearLoginInfo();
} catch (ClassNotFoundException e) {
}
} else {
ToastUtils.showLong(baseModel.getMsg());
}
}
}
@Override
public void onFailure(Call<BaseModel<List<FamilyEarnings>>> call, Throwable t) {
LogUtils.e("familyEarnings", t.fillInStackTrace());
}
});
}
}

3
BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java
View File

@@ -280,6 +280,9 @@ public class Constants {
public static final String GET_ROOM_GIFT = "/api/Room/room_give_gift";//直播间送礼
public static final String POST_CP_GIVE_GIFT = "/api/UserCp/cpGiveGift";//用户CP礼物回赠
public static final String GET_CP_ZONE = "/api/UserCp/cpZone";//心动空间
public static final String POST_MY_FAMILY = "/api/Family/myFamily";//我的家族
public static final String POST_MY_JOIN_FAMILY = "/api/Family/myJoinFamily";//我加入的家族
public static final String POST_FAMILY_EARNINGS = "/api/Family/familyEarnings";//家族收益详情
public static final String GET_ROOM_USER = "/api/Room/room_user_home";//房间内点击头像
public static final String APPLY_PIT = "/api/RoomPit/apply_pit";//申请上麦
public static final String DOWN_PIT = "/api/RoomPit/down_pit";//下麦