diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/TasksMessage.kt b/BaseModule/src/main/java/com/xscm/moduleutil/bean/TasksMessage.kt new file mode 100644 index 00000000..4df64d47 --- /dev/null +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/TasksMessage.kt @@ -0,0 +1,11 @@ +package com.xscm.moduleutil.bean + +/** + * 项目名称:羽声语音 + * 时间:2025/12/16 11:35 + * 用途:任务未领取角标 + */ +class TasksMessage { + var num: Int=0 + var not_received_tasks_num : Int=0 //任务未领取奖励数 这是心跳中返回的参数,用于展示任务未领取角标,是在房间内展示的 +} \ No newline at end of file diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java index e9bb7533..e132d73f 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -13,6 +13,7 @@ import com.xscm.moduleutil.widget.Constants; import java.util.List; import io.reactivex.Observable; +import okhttp3.RequestBody; import okhttp3.ResponseBody; import retrofit2.Call; import retrofit2.http.Field; @@ -556,6 +557,9 @@ public interface ApiServer { @GET(Constants.GET_WALLET) Call> wallet(); + @GET(Constants.GET_TASKS_MESSAGE) + Call> getTasksMessage(); + @FormUrlEncoded @POST(Constants.REDPACKET_CREATE) Call redPacketCreate(@Field("type") int type, @Field("password") String password, @Field("coin_type") int coin_type, @Field("total_amount") String total_amount, @@ -629,7 +633,7 @@ public interface ApiServer { @FormUrlEncoded @POST(Constants.POST_KEEP_XINTIAO) - Call keepXintiao(@Field("room_id") String room_id); + Call> keepXintiao(@Field("room_id") String room_id); @FormUrlEncoded @POST(Constants.DOWN_PIT) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index ebacc958..4813801a 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -79,6 +79,7 @@ public class RetrofitClient { public interface JoinRoomLoadListener { void onJoinRoomLoad(String result); } + public void setJoinRoomLoadListener(JoinRoomLoadListener joinRoomLoadListener) { this.joinRoomLoadListener = joinRoomLoadListener; } @@ -161,6 +162,16 @@ public class RetrofitClient { return cpListener; } + private TasksMessageListener tasksMessageListener; + + public interface TasksMessageListener { + void onTasksMessageNum(int result); + } + + public void setTasksMessageListener(TasksMessageListener tasksMessageListener) { + this.tasksMessageListener = tasksMessageListener; + } + public static RetrofitClient getInstance() { if (INSTANCE == null) { @@ -545,7 +556,7 @@ public class RetrofitClient { } catch (ClassNotFoundException e) { } } else { - ToastUtils.showLong(baseModel.getMsg()); + ToastUtils.showLong(baseModel.getMsg()); } } } @@ -921,7 +932,7 @@ public class RetrofitClient { BaseModel> baseModel = response.body(); if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else if (baseModel.getCode() == 0) { + } else if (baseModel.getCode() == 0) { observer.onNext(new ArrayList<>()); } } @@ -942,7 +953,7 @@ public class RetrofitClient { BaseModel> baseModel = response.body(); if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else if (baseModel.getCode() == 0) { + } else if (baseModel.getCode() == 0) { observer.onNext(new ArrayList<>()); } } @@ -1062,8 +1073,8 @@ public class RetrofitClient { sApiServer.dailyTasksOpenBox(gift_box_id).compose(new DefaultTransformer<>()).subscribe(observer); } - public void dailyTasksReceive(String task_id,String student_id, BaseObserver observer) { - sApiServer.dailyTasksReceive(task_id,student_id).enqueue(new Callback() { + public void dailyTasksReceive(String task_id, String student_id, BaseObserver observer) { + sApiServer.dailyTasksReceive(task_id, student_id).enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { @@ -2261,10 +2272,10 @@ public class RetrofitClient { } } else if (roomInfoRespBaseModel.getCode() == 0) { ToastUtils.showShort(roomInfoRespBaseModel.getMsg()); - if (joinRoomLoadListener != null){ + if (joinRoomLoadListener != null) { joinRoomLoadListener.onJoinRoomLoad(roomInfoRespBaseModel.getMsg()); } - }else if (roomInfoRespBaseModel.getCode() == 202){ + } else if (roomInfoRespBaseModel.getCode() == 202) { observer.onNext(roomInfoRespBaseModel.getData()); } else { MessageListenerSingleton.getInstance().quitGroup(roomId); @@ -2362,7 +2373,7 @@ public class RetrofitClient { }); } - public void check_create_room(BaseObserver observer){ + public void check_create_room(BaseObserver observer) { sApiServer.checkCreateRoom().enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2370,9 +2381,9 @@ public class RetrofitClient { BaseModel stringBaseModel = response.body(); if (stringBaseModel.getCode() == 1) { observer.onNext(""); - }else if (stringBaseModel.getCode() == 0) { + } else if (stringBaseModel.getCode() == 0) { com.hjq.toast.ToastUtils.show(stringBaseModel.getMsg()); - }else if(stringBaseModel.getCode()==301){ + } else if (stringBaseModel.getCode() == 301) { try { CommonAppContext.getInstance().clearLoginInfo(); ToastUtils.showShort(stringBaseModel.getMsg()); @@ -2380,7 +2391,7 @@ public class RetrofitClient { throw new RuntimeException(e); } } - }else { + } else { LogUtils.e("check_create_room", response.message()); } @@ -2426,7 +2437,7 @@ public class RetrofitClient { BaseModel roomOnlineBaseModel = response.body(); if (roomOnlineBaseModel.getCode() == 1) { observer.onNext(roomOnlineBaseModel.getData()); - }else if (roomOnlineBaseModel.getCode() == 0) { + } else if (roomOnlineBaseModel.getCode() == 0) { ToastUtils.showLong(roomOnlineBaseModel.getMsg()); } } @@ -2468,7 +2479,7 @@ public class RetrofitClient { }); } - public void index_recommend_room(BaseObserver observer) { + public void index_recommend_room(BaseObserver observer) { sApiServer.index_recommend_room().enqueue(new Callback>() { @Override @@ -2478,7 +2489,7 @@ public class RetrofitClient { if (indexRecommendRoomBaseModel.getCode() == 1) { if (indexRecommendRoomBaseModel.getData() == null) { observer.onNext(new IndexRecommendRoom()); - }else { + } else { observer.onNext(indexRecommendRoomBaseModel.getData()); } } else if (indexRecommendRoomBaseModel.getCode() == 0) { @@ -2496,11 +2507,11 @@ public class RetrofitClient { @Override public void onFailure(Call> call, Throwable t) { - LogUtils.e("首页房间推荐",t.fillInStackTrace()); + LogUtils.e("首页房间推荐", t.fillInStackTrace()); } }); - } + } public void wallet(BaseObserver observer) { sApiServer.wallet().enqueue(new Callback>() { @@ -2521,7 +2532,36 @@ public class RetrofitClient { }); } - public void redPacketCreate(int type, String password, int coin_type, String total_amount, String total_count, String conditions, String countdown, String room_id, String remark, BaseObserver observer) { + public void getTasksMessage(BaseObserver observer) { + sApiServer.getTasksMessage().enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel tasksMessage = response.body(); + if (tasksMessage.getCode() == 1) { + observer.onNext(tasksMessage.getData()); + } else if (tasksMessage.getCode() == 0) { + } else if (tasksMessage.getCode() == 301) { + try { + CommonAppContext.getInstance().clearLoginInfo(); + ToastUtils.showShort(tasksMessage.getMsg()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + LogUtils.e("任务个数", t.fillInStackTrace()); + } + }); + } + + public void redPacketCreate(int type, String password, int coin_type, String + total_amount, String total_count, String conditions, String countdown, String + room_id, String remark, BaseObserver observer) { sApiServer.redPacketCreate(type, password, coin_type, total_amount, total_count, conditions, countdown, room_id, remark).enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { @@ -2582,7 +2622,8 @@ public class RetrofitClient { // }); } - public void appPay(String user_id, String money, String coin, String type, String type_params, String type_id, String nobility_id, BaseObserver observer) { + public void appPay(String user_id, String money, String coin, String type, String + type_params, String type_id, String nobility_id, BaseObserver observer) { sApiServer.appPay(user_id, money, coin, type, type_params, type_id, nobility_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2641,7 +2682,8 @@ public class RetrofitClient { }); } - public void bind(String userId, String type, String alipayAccount, String bank_card_number, String bank_card, String open_bank, BaseObserver observer) { + public void bind(String userId, String type, String alipayAccount, String + bank_card_number, String bank_card, String open_bank, BaseObserver observer) { sApiServer.bind(userId, type, alipayAccount, bank_card_number, bank_card, open_bank).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2674,7 +2716,8 @@ public class RetrofitClient { }); } - public void getRoomUserInfo(String room_id, String user_id, BaseObserver observer) { + public void getRoomUserInfo(String room_id, String + user_id, BaseObserver observer) { sApiServer.getRoomUserInfo(room_id, user_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -2693,8 +2736,9 @@ public class RetrofitClient { }); } - public void songList(String room_id,String page, BaseObserver> observer) { - sApiServer.songList(room_id,page).enqueue(new Callback>>() { + public void songList(String room_id, String + page, BaseObserver> observer) { + sApiServer.songList(room_id, page).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { if (response.code() == 200) { @@ -2734,7 +2778,8 @@ public class RetrofitClient { } - public void getSearch(String keyWord, String type, BaseObserver> observer) { + public void getSearch(String keyWord, String + type, BaseObserver> observer) { sApiServer.getSearch(keyWord, type).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { @@ -2857,7 +2902,8 @@ public class RetrofitClient { }); } - public void roomAuctionJoin(String auctionId, String userId, String giftId, String num, String type, BaseObserver observer) { + public void roomAuctionJoin(String auctionId, String userId, String giftId, String + num, String type, BaseObserver observer) { sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type).enqueue(new ApiResponseCallback(CommonAppContext.getInstance()) { @Override public void onSuccess(RoomAuction.AuctionListBean data) { @@ -3200,7 +3246,8 @@ public class RetrofitClient { }); } - public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id, BaseObserver observer) { + public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String + type, String pit_number, String heart_id, BaseObserver observer) { sApiServer.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -3238,7 +3285,8 @@ public class RetrofitClient { }); } - public void cpGiveGift(String user_id, String gift_id, String room_id, BaseObserver observer) { + public void cpGiveGift(String user_id, String gift_id, String + room_id, BaseObserver observer) { sApiServer.cpGiveGift(user_id, gift_id, room_id).enqueue(new Callback>() { @Override @@ -3432,21 +3480,36 @@ public class RetrofitClient { } public void keepXintiao(String roomId) { - sApiServer.keepXintiao(roomId).enqueue(new Callback() { + sApiServer.keepXintiao(roomId).enqueue(new Callback>() { @Override - public void onResponse(Call call, Response response) { - + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel tasksMessage = response.body(); + assert tasksMessage != null; + if (tasksMessage.getCode() == 1) { + if (tasksMessageListener != null) { + tasksMessageListener.onTasksMessageNum(tasksMessage.getData().getNot_received_tasks_num()); + } + } else if (tasksMessage.getCode() == 0) { + } else if (tasksMessage.getCode() == 301) { + try { + CommonAppContext.getInstance().clearLoginInfo(); + ToastUtils.showShort(tasksMessage.getMsg()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + } } @Override - public void onFailure(Call call, Throwable t) { - + public void onFailure(Call> call, Throwable t) { + LogUtils.e("心跳: " + t.fillInStackTrace()); } }); } - public void setMutePit(String roomId, String user_id, String - isMute, BaseObserver observer) { + public void setMutePit(String roomId, String user_id, String isMute, BaseObserver observer) { sApiServer.setMutePit(roomId, user_id, isMute).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -3586,7 +3649,8 @@ public class RetrofitClient { }); } - public void roomRelationList(String type, BaseObserver> observer) { + public void roomRelationList(String + type, BaseObserver> observer) { sApiServer.roomRelationList(type).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { @@ -3723,7 +3787,7 @@ public class RetrofitClient { public void quitRoom(String room_id, String user_id, BaseObserver observer) { - if (room_id == null ||room_id.isEmpty()) + if (room_id == null || room_id.isEmpty()) return; sApiServer.quitRoom(room_id, user_id).enqueue(new Callback() { @Override @@ -3738,7 +3802,8 @@ public class RetrofitClient { }); } - public void getFriendListMore(String user_id, String relation_id, BaseObserver> observer) { + public void getFriendListMore(String user_id, String + relation_id, BaseObserver> observer) { sApiServer.getFriendListMore(user_id, relation_id).enqueue(new Callback>>() { @Override @@ -3884,7 +3949,8 @@ public class RetrofitClient { }); } - public void commentZone(String id, String content, String pid, String reply_to, BaseObserver observer) { + public void commentZone(String id, String content, String pid, String + reply_to, BaseObserver observer) { sApiServer.commentZone(id, content, pid, reply_to).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -3898,7 +3964,8 @@ public class RetrofitClient { }); } - public void getFriendList(String userId, String page, String page_limit, BaseObserver observer) { + public void getFriendList(String userId, String page, String + page_limit, BaseObserver observer) { sApiServer.getFriendList(userId, page, page_limit).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -3941,8 +4008,8 @@ public class RetrofitClient { }); } - public void cancel(String sms_code,BaseObserver observer) { - sApiServer.cancel(SpUtil.getToken(),sms_code).enqueue(new Callback>() { + public void cancel(String sms_code, BaseObserver observer) { + sApiServer.cancel(SpUtil.getToken(), sms_code).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -3970,7 +4037,8 @@ public class RetrofitClient { }); } - public void getPostData(String new_password, String mobile, String code, String userId, BaseObserver observer) { + public void getPostData(String new_password, String mobile, String code, String + userId, BaseObserver observer) { sApiServer.getPostData(new_password, mobile, code, userId).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -4127,7 +4195,8 @@ public class RetrofitClient { }); } - public void userOnlineStatus(String user_id, String roomId, BaseObserver> observer) { + public void userOnlineStatus(String user_id, String + roomId, BaseObserver> observer) { sApiServer.userOnlineStatus(user_id, roomId).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { @@ -4304,7 +4373,8 @@ public class RetrofitClient { }); } - public void onNextRetu(Response> response, BaseObserver observer) { + public void onNextRetu + (Response> response, BaseObserver observer) { if (response.code() == 200) { BaseModel string = response.body(); if (string != null) { @@ -4427,7 +4497,8 @@ public class RetrofitClient { } /// 盲盒转盘抽奖 - public void drawGiftList(String giftBagId, String gift_user_ids, String roomId, String num, String heart_id, String auction_id, BaseObserver observer) { + public void drawGiftList(String giftBagId, String gift_user_ids, String roomId, String + num, String heart_id, String auction_id, BaseObserver observer) { sApiServer.drawGiftList(giftBagId, gift_user_ids, roomId, num, heart_id, auction_id).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -4647,7 +4718,8 @@ public class RetrofitClient { }); } - public void roomUserCharmList(String room_id, String user_id, BaseObserver> observer) { + public void roomUserCharmList(String room_id, String + user_id, BaseObserver> observer) { sApiServer.roomUserCharmList(room_id, user_id).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { @@ -4697,8 +4769,8 @@ public class RetrofitClient { }); } - public void signCoin(String sign_id,String sign_value, BaseObserver observer) { - sApiServer.signCoin(sign_id,sign_value).enqueue(new Callback>() { + public void signCoin(String sign_id, String sign_value, BaseObserver observer) { + sApiServer.signCoin(sign_id, sign_value).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -4713,8 +4785,8 @@ public class RetrofitClient { } - public void getCpRoom(String userId,int page, BaseObserver observer) { - sApiServer.getCpRoom(userId,page+"").enqueue(new Callback>() { + public void getCpRoom(String userId, int page, BaseObserver observer) { + sApiServer.getCpRoom(userId, page + "").enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { if (response.code() == 200) { @@ -4792,7 +4864,8 @@ public class RetrofitClient { } } - public void familyEarnings(String user_id, int page, String start_time, String end_time, BaseObserver> observer) { + public void familyEarnings(String user_id, int page, String start_time, String + end_time, BaseObserver> observer) { sApiServer.familyEarnings(user_id, page, start_time, end_time).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { @@ -4893,7 +4966,7 @@ public class RetrofitClient { }); } - public void signRefuse(String roomId,BaseObserver observer){ + public void signRefuse(String roomId, BaseObserver observer) { sApiServer.signRefuse(roomId).enqueue(new Callback>() { @Override @@ -4908,8 +4981,8 @@ public class RetrofitClient { }); } - public void freeReSign(int type, String userId,BaseObserver observer) { - if (type==1) { + public void freeReSign(int type, String userId, BaseObserver observer) { + if (type == 1) { sApiServer.freeReSign(userId).enqueue(new Callback>() { @Override @@ -4922,7 +4995,7 @@ public class RetrofitClient { LogUtils.e("freeReSign", t.fillInStackTrace()); } }); - }else { + } else { sApiServer.reSign(userId).enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -4938,17 +5011,17 @@ public class RetrofitClient { } public void signIn(BaseObserver> observer) { - sApiServer.signIn().enqueue(new Callback>>(){ + sApiServer.signIn().enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { - if (response.code()==200){ + if (response.code() == 200) { BaseModel> baseModel = response.body(); - if (baseModel.getCode()==1 ){ - observer.onNext(baseModel.getData()!=null ? baseModel.getData() : new ArrayList()); - }else if (baseModel.getCode()==0){ + if (baseModel.getCode() == 1) { + observer.onNext(baseModel.getData() != null ? baseModel.getData() : new ArrayList()); + } else if (baseModel.getCode() == 0) { com.hjq.toast.ToastUtils.show(baseModel.getMsg()); - }else if (baseModel.getCode()==301){ + } else if (baseModel.getCode() == 301) { try { CommonAppContext.getInstance().clearLoginInfo(); ToastUtils.showShort(baseModel.getMsg()); @@ -4956,8 +5029,8 @@ public class RetrofitClient { throw new RuntimeException(e); } } - }else { - LogUtils.e("signIn",response.errorBody()); + } else { + LogUtils.e("signIn", response.errorBody()); } } @@ -4968,8 +5041,9 @@ public class RetrofitClient { }); } + public void dailyTasksSign(BaseObserver observer) { - sApiServer.postDailyTasksSign().enqueue(new Callback>(){ + sApiServer.postDailyTasksSign().enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { @@ -4983,18 +5057,19 @@ public class RetrofitClient { }); } + public void tasksSignStatus(BaseObserver observer) { - sApiServer.postDailyTasksSignStatus().enqueue(new Callback>(){ + sApiServer.postDailyTasksSignStatus().enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { - if (response.code()==200){ + if (response.code() == 200) { BaseModel baseModel = response.body(); - if (baseModel.getCode()==1){ + if (baseModel.getCode() == 1) { observer.onNext(baseModel.getData()); - }else if (baseModel.getCode()==0){ + } else if (baseModel.getCode() == 0) { com.hjq.toast.ToastUtils.show(baseModel.getMsg()); - }else if (baseModel.getCode()==301){ + } else if (baseModel.getCode() == 301) { try { CommonAppContext.getInstance().clearLoginInfo(); ToastUtils.showShort(baseModel.getMsg()); @@ -5002,8 +5077,8 @@ public class RetrofitClient { throw new RuntimeException(e); } } - }else { - LogUtils.e("postDailyTasksSignStatus",response.errorBody()); + } else { + LogUtils.e("postDailyTasksSignStatus", response.errorBody()); } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java index 63d77d95..3cafe89d 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java @@ -272,6 +272,7 @@ public class Constants { public static final String GET_ROOM_TYPE = "/api/Index/room_type_list";//房间分类列表 public static final String GET_GIVE_GIFT = "/api/Gift/chat_gift_send";//聊天送礼物 public static final String GET_WALLET = "/api/UserWallet/wallet";//钱包 + public static final String GET_TASKS_MESSAGE = "/api/Tasks/dailyTasksUnReceiveCount";//【新】未领取奖励任务数量 public static final String REDPACKET_CREATE = "/api/Redpacket/create";//创建红包 public static final String ROOM_REDPACKET = "/api/Redpacket/roomRedPackets";//红包列表 diff --git a/BaseModule/src/main/res/mipmap-hdpi/day_task.png b/BaseModule/src/main/res/mipmap-hdpi/day_task.png new file mode 100644 index 00000000..cfcb1dba Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/day_task.png differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/day_task.webp b/BaseModule/src/main/res/mipmap-hdpi/day_task.webp deleted file mode 100644 index 85de5c22..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/day_task.webp and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/me_test.png b/BaseModule/src/main/res/mipmap-hdpi/me_test.png new file mode 100644 index 00000000..0e3128c9 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/me_test.png differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/me_test.webp b/BaseModule/src/main/res/mipmap-hdpi/me_test.webp deleted file mode 100644 index 53f24612..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/me_test.webp and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/day_task.png b/BaseModule/src/main/res/mipmap-xhdpi/day_task.png new file mode 100644 index 00000000..1b158fcc Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/day_task.png differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/day_task.webp b/BaseModule/src/main/res/mipmap-xhdpi/day_task.webp deleted file mode 100644 index 9161936e..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/day_task.webp and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/me_test.png b/BaseModule/src/main/res/mipmap-xhdpi/me_test.png new file mode 100644 index 00000000..d7397569 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/me_test.png differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/me_test.webp b/BaseModule/src/main/res/mipmap-xhdpi/me_test.webp deleted file mode 100644 index ab1fe8fe..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/me_test.webp and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/day_task.png b/BaseModule/src/main/res/mipmap-xxhdpi/day_task.png new file mode 100644 index 00000000..05605720 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/day_task.png differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/day_task.webp b/BaseModule/src/main/res/mipmap-xxhdpi/day_task.webp deleted file mode 100644 index 3a26d66f..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/day_task.webp and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/me_test.png b/BaseModule/src/main/res/mipmap-xxhdpi/me_test.png new file mode 100644 index 00000000..948619d0 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/me_test.png differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/me_test.webp b/BaseModule/src/main/res/mipmap-xxhdpi/me_test.webp deleted file mode 100644 index 502b1562..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/me_test.webp and /dev/null differ diff --git a/BaseModule/src/main/res/values/strings.xml b/BaseModule/src/main/res/values/strings.xml index 671f9a1d..49efa6a1 100644 --- a/BaseModule/src/main/res/values/strings.xml +++ b/BaseModule/src/main/res/values/strings.xml @@ -10,7 +10,7 @@ 个性装扮 道具商城 我的背包 - 每日任务 + 任务 消息 设置 我的家族 diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index ecaf1301..48857d91 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -118,6 +118,7 @@ import com.xscm.moduleutil.bean.RoomMessageEvent.T import com.xscm.moduleutil.bean.RoomMessageEvent.text import com.xscm.moduleutil.bean.RoomSettingEvent import com.xscm.moduleutil.bean.RoomSingleton +import com.xscm.moduleutil.bean.TasksMessage import com.xscm.moduleutil.bean.UserInfo import com.xscm.moduleutil.bean.UserOnlineStatusBean import com.xscm.moduleutil.bean.XLHBean @@ -152,6 +153,7 @@ import com.xscm.moduleutil.event.SurfaceEvent import com.xscm.moduleutil.event.UnreadCountEvent import com.xscm.moduleutil.http.BaseObserver import com.xscm.moduleutil.http.RetrofitClient +import com.xscm.moduleutil.http.RetrofitClient.TasksMessageListener import com.xscm.moduleutil.interfaces.OnMusicItemClickListener import com.xscm.moduleutil.listener.MessageListenerSingleton import com.xscm.moduleutil.listener.MessageListenerSingleton.OnMessageReceivedListener @@ -241,6 +243,7 @@ class RoomActivity : BaseMvpActivity(), private var appStateListener: AppStateListener? = null private var qxRedPacketManager: QXRedPacketManager? = null + //用户列表用 private var mOnlineBean: RoomOnline? = null @@ -343,6 +346,11 @@ class RoomActivity : BaseMvpActivity(), preloadFloatingViews() initPublicScreenFragment() + + RetrofitClient.getInstance().setTasksMessageListener(TasksMessageListener { result: Int -> + LogUtils.e("tasksMessageListener", result) + getTasksMessageService(result) + }) } @SuppressLint("ClickableViewAccessibility") @@ -1011,6 +1019,7 @@ class RoomActivity : BaseMvpActivity(), MvpPre?.roomRedPackets(roomId) + Observable.timer(1000, TimeUnit.MILLISECONDS).observeOn( AndroidSchedulers.mainThread() ).subscribe { aLong: Long? -> @@ -3783,6 +3792,7 @@ class RoomActivity : BaseMvpActivity(), // AgoraManager.getInstance() // .joinRoom(SpUtil.getRtmToken(), roomId, SpUtil.getUserId(), false, false); // MvpPre?.postRoomInfo(roomId) + MvpPre?.getTasksMessage() } fun refreshRoomInfo(roomId: String) { @@ -3823,7 +3833,6 @@ class RoomActivity : BaseMvpActivity(), } - // TODO: 根据返回的在线列表获取对应的值,查看是否有在线用户 override fun getRoomOnline(onlineBean: RoomOnline?) { if (onlineBean != null) { @@ -4100,6 +4109,26 @@ class RoomActivity : BaseMvpActivity(), } } + override fun getTasksMessage(data: TasksMessage?) { + if (data != null) { + mBinding?.tvTaskMessage?.text = "+" + data.num + if (data.num == 0) { + mBinding?.tvTaskMessage?.visibility = View.GONE + } else { + mBinding?.tvTaskMessage?.visibility = View.VISIBLE + } + } + } + + fun getTasksMessageService(number: Int) { + mBinding?.tvTaskMessage?.text = "+" + number + if (number == 0) { + mBinding?.tvTaskMessage?.visibility = View.GONE + } else { + mBinding?.tvTaskMessage?.visibility = View.VISIBLE + } + } + private fun queren1(nickname: String) { // 创建并显示确认对话框 ConfirmDialog( diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java index da94ea47..95545789 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java @@ -6,6 +6,7 @@ import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RoomCharmRankBean; +import com.xscm.moduleutil.bean.TasksMessage; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomOnline; @@ -52,6 +53,8 @@ public class RoomContacts { void findRoom(); void roomRedPackets(List list); + + void getTasksMessage(TasksMessage data); } public interface IRoomPre extends IPresenter { @@ -93,5 +96,7 @@ public class RoomContacts { void auctionDelay(String auctionId); void roomRedPackets(String roomId); + + void getTasksMessage(); } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java index 76feeb60..5898bf98 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java @@ -29,6 +29,7 @@ import com.xscm.moduleutil.base.CommonAppContext; import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RoomCharmRankBean; import com.xscm.moduleutil.bean.RoomMessageEvent; +import com.xscm.moduleutil.bean.TasksMessage; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.EMMessageInfo; import com.xscm.moduleutil.bean.room.FriendInfo; @@ -763,6 +764,11 @@ public class RoomFragment extends BaseMvpFragment auctionListBeans, String user_id) { boolean haveMe = false; diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java index 11eee912..e6070dc3 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java @@ -29,6 +29,7 @@ import com.xscm.moduleutil.bean.MusicSongBean; import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RoomCharmRankBean; import com.xscm.moduleutil.bean.RoomMessageEvent; +import com.xscm.moduleutil.bean.TasksMessage; import com.xscm.moduleutil.bean.UserInfo; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.RoomInfoResp; @@ -1132,4 +1133,9 @@ public class RoomKtvFragment extends BaseMvpFragment implements R } }); } + + @Override + public void getTasksMessage() { + api.getTasksMessage(new BaseObserver(){ + + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); + } + + @Override + public void onNext(TasksMessage s) { + if (MvpRef==null) + MvpRef=new WeakReference<>(mView); + MvpRef.get().getTasksMessage(s); + } + }); + } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java index cef8e880..52a28ef1 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java @@ -5,6 +5,7 @@ import android.app.Activity; import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.bean.BannerModel; +import com.xscm.moduleutil.bean.TasksMessage; import com.xscm.moduleutil.bean.UserInfo; import com.xscm.moduleutil.bean.WalletBean; @@ -23,6 +24,8 @@ public final class MeConacts { void wallet(WalletBean walletBean); void setBanners(List bannerModels); + + void getTasksMessage(TasksMessage data); } public interface IMePre extends IPresenter { @@ -40,6 +43,8 @@ public final class MeConacts { void wallet(); + + void getTasksMessage(); } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java index e45c5682..2383ab23 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java @@ -47,6 +47,7 @@ import com.xscm.modulemain.activity.user.presenter.MePresenter; import com.xscm.modulemain.activity.WebViewActivity; import com.xscm.modulemain.dialog.UserNetWorthDialog; import com.xscm.moduleutil.base.WebUrlConstants; +import com.xscm.moduleutil.bean.TasksMessage; import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.widget.ShineTextView; import com.xscm.moduleutil.base.BaseMvpFragment; @@ -170,6 +171,7 @@ public class VocalRangeFragment extends BaseMvpFragment implements MeCona }); } + @Override + public void getTasksMessage() { + api.getTasksMessage(new BaseObserver () { + + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); + } + + @Override + public void onNext(TasksMessage s) { + if (MvpRef==null){ + MvpRef=new WeakReference<>(mView); + } + MvpRef.get().getTasksMessage(s); + } + }); + } + public void getBanners(String s) { // Type listType = new TypeToken>() {}.getType(); // List restoredRoomModels = GsonUtils.getGSON().fromJson(SpUtils.getHomeBanner(), listType); diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java index be967ec7..70da728a 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java @@ -21,6 +21,7 @@ import com.xscm.modulemain.databinding.FragmentRoomOnlineDialogBinding; import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.bean.RedPacketInfo; import com.xscm.moduleutil.bean.RoomCharmRankBean; +import com.xscm.moduleutil.bean.TasksMessage; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.RoomInfoResp; import com.xscm.moduleutil.bean.room.RoomOnline; @@ -386,4 +387,9 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment - + - + + + + + + + + + diff --git a/MainModule/src/main/res/layout/fragment_vocal_range.xml b/MainModule/src/main/res/layout/fragment_vocal_range.xml index c787a00a..e43ea401 100644 --- a/MainModule/src/main/res/layout/fragment_vocal_range.xml +++ b/MainModule/src/main/res/layout/fragment_vocal_range.xml @@ -801,9 +801,6 @@ - - - @@ -841,11 +838,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_12" - app:flexWrap="wrap" + app:alignContent="flex_start" app:alignItems="stretch" - app:justifyContent="flex_start" app:flexDirection="row" - app:alignContent="flex_start"> + app:flexWrap="wrap" + app:justifyContent="flex_start"> + app:layout_flexBasisPercent="25%" + app:layout_flexGrow="1"> + app:layout_flexBasisPercent="25%" + app:layout_flexGrow="1"> - + app:layout_flexBasisPercent="25%" + app:layout_flexGrow="1"> - + + + + + + + + app:layout_flexBasisPercent="25%" + app:layout_flexGrow="1"> + app:layout_flexGrow="1"> + app:layout_flexGrow="1" /> + app:layout_flexBasisPercent="25%" + app:layout_flexGrow="1" />