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 14:38:03 +08:00
parent b089f4a56f
commit 784a67214d
10 changed files with 387 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -870,4 +870,6 @@ public interface ApiServer {
@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);
@GET(Constants.GET_SKILL_LIST)
Call<BaseModel<List<String>>> skillList();
}

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

@@ -520,8 +520,8 @@ public class RetrofitClient {
});
}
public void postInvite(String apply_id,String type,BaseObserver<String> observer) {
sApiServer.postInvite(apply_id,type).enqueue(new Callback<BaseModel<String>>() {
public void postInvite(String apply_id, String type, BaseObserver<String> observer) {
sApiServer.postInvite(apply_id, type).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
@@ -543,7 +543,7 @@ public class RetrofitClient {
@Override
public void onFailure(Call<BaseModel<String>> call, Throwable t) {
LogUtils.e("修改公会公告失败",t.fillInStackTrace());
LogUtils.e("修改公会公告失败", t.fillInStackTrace());
}
});
}
@@ -3099,7 +3099,7 @@ public class RetrofitClient {
if (response.code() == 200) {
BaseModel<RoomGiftData> data = response.body();
if (data.getCode() == 1) {
if (data.getData()!=null) {
if (data.getData() != null) {
if (data.getData().getCp_type() != null) {
if (cpListener != null) {
cpListener.onSendCpMsg(data.getData());
@@ -3107,7 +3107,7 @@ public class RetrofitClient {
}
observer.onNext(data.getData());//2025年11月25日09:10:54，服务端修改，应该是都不能等于null
}else {
} else {
observer.onNext(new RoomGiftData());//这里添加这个，是预防报错
}
} else if (data.getCode() == 0) {
@@ -4559,7 +4559,7 @@ public class RetrofitClient {
}
public void getCpRoom(String userId,BaseObserver<HeartCpBean> observer) {
public void getCpRoom(String userId, BaseObserver<HeartCpBean> observer) {
sApiServer.getCpRoom(userId).enqueue(new Callback<BaseModel<HeartCpBean>>() {
@Override
public void onResponse(Call<BaseModel<HeartCpBean>> call, Response<BaseModel<HeartCpBean>> response) {
@@ -4581,8 +4581,8 @@ public class RetrofitClient {
});
}
public void myFamily(int type,BaseObserver<MyFamilyBean> observer) {
if (type==1) {
public void myFamily(int type, BaseObserver<MyFamilyBean> observer) {
if (type == 1) {
sApiServer.myFamily().enqueue(new Callback<BaseModel<MyFamilyBean>>() {
@Override
@@ -4590,7 +4590,7 @@ public class RetrofitClient {
if (response.code() == 200) {
BaseModel<MyFamilyBean> baseModel = response.body();
if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()!=null ? baseModel.getData() : new MyFamilyBean());
observer.onNext(baseModel.getData() != null ? baseModel.getData() : new MyFamilyBean());
} else if (baseModel.getCode() == 301) {
try {
ToastUtils.showShort(baseModel.getMsg());
@@ -4608,7 +4608,7 @@ public class RetrofitClient {
LogUtils.e("myFamily", t.fillInStackTrace());
}
});
}else {
} else {
sApiServer.myJoinFamily().enqueue(new Callback<BaseModel<MyFamilyBean>>() {
@Override
@@ -4616,7 +4616,7 @@ public class RetrofitClient {
if (response.code() == 200) {
BaseModel<MyFamilyBean> baseModel = response.body();
if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()!=null ? baseModel.getData() : new MyFamilyBean());
observer.onNext(baseModel.getData() != null ? baseModel.getData() : new MyFamilyBean());
} else if (baseModel.getCode() == 301) {
try {
ToastUtils.showShort(baseModel.getMsg());
@@ -4638,14 +4638,14 @@ public class RetrofitClient {
}
}
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>>>() {
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>());
observer.onNext(baseModel.getData() != null ? baseModel.getData() : new ArrayList<FamilyEarnings>());
} else if (baseModel.getCode() == 301) {
try {
ToastUtils.showShort(baseModel.getMsg());
@@ -4666,5 +4666,32 @@ public class RetrofitClient {
}
public void skillList(BaseObserver<List<String>> observer) {
sApiServer.skillList().enqueue(new Callback<BaseModel<List<String>>>() {
@Override
public void onResponse(Call<BaseModel<List<String>>> call, Response<BaseModel<List<String>>> response) {
if (response.code() == 200) {
BaseModel<List<String>> baseModel = response.body();
if (baseModel.getCode() == 1)
observer.onNext(baseModel.getData() != null ? baseModel.getData() : new ArrayList<String>());
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<String>>> call, Throwable t) {
LogUtils.e("skillList", t.fillInStackTrace());
}
});
}
}

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

@@ -430,6 +430,7 @@ public class Constants {
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信息
public static final String GET_SKILL_LIST = "/api/Sign/skill_list";//才艺列表