密码房部分,幸运抽奖部分。

This commit is contained in:
2026-01-26 10:27:29 +08:00
parent 9450a351c5
commit 24c4af95b4
38 changed files with 958 additions and 149 deletions

View File

@@ -5,4 +5,5 @@ import java.io.Serializable
class BeforeJoinRoomCheckBean :Serializable {
var room_id:String? = null
var msg:String? = null
var code:Int = -1
}

View File

@@ -555,7 +555,7 @@ public interface ApiServer {
@FormUrlEncoded
@POST(Constants.JOIN_ROOM)
Call<BaseModel<RoomInfoResp>> roomGetIn(@Field("room_id") String roomId, @Field("password") String password);
Call<BaseModel<RoomInfoResp>> roomGetIn(@Field("room_id") String roomId, @Field("room_password") String password);
@FormUrlEncoded
@POST(Constants.BEFORE_JOIN_ROOM_CHECK)
Call<BaseModel<BeforeJoinRoomCheckBean>> beforeJoinRoomCheck(@Field("room_id") String roomId);

View File

@@ -24,6 +24,7 @@ import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean;
import com.xscm.moduleutil.bean.room.*;
import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
import com.xscm.moduleutil.listener.CPListener;
import com.xscm.moduleutil.listener.JoinRoomErrorListener;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.utils.SpUtil;
import com.xscm.moduleutil.utils.SystemUtils;
@@ -71,6 +72,7 @@ public class RetrofitClient {
public ApiServer getApiServer() {
return sApiServer;
}
public OkHttpClient getHttpClient() {
return client;
}
@@ -329,8 +331,8 @@ public class RetrofitClient {
});
}
public void giftWallUserList(String user_id,String gift_id,int page,BaseObserver<GiftWallUserBean> observer) {
sApiServer.giftWallUserList(user_id,gift_id,page).enqueue(new Callback<BaseModel<GiftWallUserBean>>() {
public void giftWallUserList(String user_id, String gift_id, int page, BaseObserver<GiftWallUserBean> observer) {
sApiServer.giftWallUserList(user_id, gift_id, page).enqueue(new Callback<BaseModel<GiftWallUserBean>>() {
@Override
public void onResponse(Call<BaseModel<GiftWallUserBean>> call, Response<BaseModel<GiftWallUserBean>> response) {
@@ -340,10 +342,10 @@ public class RetrofitClient {
observer.onNext(body.getData());
else if (body.getCode() == 0) {
ToastUtils.showLong(body.getMsg());
}else if (body.getCode() == 301) {
} else if (body.getCode() == 301) {
setCode301(body.getMsg());
}
}else {
} else {
ToastUtils.showLong("请求礼物用户错误", response.code());
LogUtils.e("giftWallUserList", response.message());
}
@@ -772,7 +774,7 @@ public class RetrofitClient {
@Override
public void onResponse(Call<BaseModel<GroupUserListBean>> call, Response<BaseModel<GroupUserListBean>> response) {
if (response.code() == 200) {
if (response.code() == 200) {
BaseModel<GroupUserListBean> baseModel = response.body();
if (baseModel.getCode() == 1)
observer.onNext(baseModel.getData());
@@ -1338,7 +1340,7 @@ public class RetrofitClient {
} else if (baseModel.getCode() == 0) {
ToastUtils.showLong(baseModel.getMsg());
}
}else {
} else {
ToastUtils.showLong("约她获取礼物出现错误", response.code());
LogUtils.e("getGiftInfoTa", response.message());
}
@@ -1350,6 +1352,7 @@ public class RetrofitClient {
}
});
}
public void meetingTa(String roomId, String userId, String giftId, BaseObserver<String> observer) {
sApiServer.meetingTa(roomId, userId, giftId).enqueue(new Callback<BaseModel<String>>() {
@@ -1357,7 +1360,7 @@ public class RetrofitClient {
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200) {
onNextRetu(response, observer);
}else {
} else {
ToastUtils.showLong("约她进房间出现错误", response.code());
LogUtils.e("meetingTa", response.message());
}
@@ -2423,8 +2426,8 @@ public class RetrofitClient {
});
}
public void setCustomGift(String gift_id, String new_gift_name,String roomId, BaseObserver<String> observer) {
sApiServer.setCustomGift(gift_id, new_gift_name,roomId).enqueue(new Callback<BaseModel<String>>() {
public void setCustomGift(String gift_id, String new_gift_name, String roomId, BaseObserver<String> observer) {
sApiServer.setCustomGift(gift_id, new_gift_name, roomId).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
@@ -2762,8 +2765,8 @@ public class RetrofitClient {
});
}
public void searchSong(String roomId,String search_user,BaseObserver<List<MusicSongBean>> observer) {
sApiServer.searchSong(roomId,search_user).enqueue(new Callback<BaseModel<List<MusicSongBean>>>() {
public void searchSong(String roomId, String search_user, BaseObserver<List<MusicSongBean>> observer) {
sApiServer.searchSong(roomId, search_user).enqueue(new Callback<BaseModel<List<MusicSongBean>>>() {
@Override
public void onResponse(Call<BaseModel<List<MusicSongBean>>> call, Response<BaseModel<List<MusicSongBean>>> response) {
@@ -2828,7 +2831,7 @@ public class RetrofitClient {
} else if (listBaseModel.getCode() == 0) {
ToastUtils.showShort(listBaseModel.getMsg());
}
}else {
} else {
ToastUtils.showLong("客服信息不正确");
LogUtils.e("appCustomerService", response.message());
}
@@ -2986,7 +2989,7 @@ public class RetrofitClient {
}
public void getBlackRoomList(String roomId,BaseObserver<List<BlackRoomBean>> observer){
public void getBlackRoomList(String roomId, BaseObserver<List<BlackRoomBean>> observer) {
sApiServer.getBlackRoomList(roomId).enqueue(new Callback<BaseModel<List<BlackRoomBean>>>() {
@Override
@@ -2994,18 +2997,18 @@ public class RetrofitClient {
if (response.code() == 200) {
BaseModel<List<BlackRoomBean>> listBaseModel = response.body();
if (listBaseModel.getCode() == 1) {
if (listBaseModel.getData()==null){
if (listBaseModel.getData() == null) {
observer.onNext(new ArrayList<>());
}else {
} else {
observer.onNext(listBaseModel.getData());
}
} else if (listBaseModel.getCode() == 301) {
setCode301(listBaseModel.getMsg());
}else if (listBaseModel.getCode() == 0) {
} else if (listBaseModel.getCode() == 0) {
ToastUtils.showShort(listBaseModel.getMsg());
observer.onNext(new ArrayList<>());
}
}else {
} else {
ToastUtils.showLong("请求交友小屋列表错误", response.code());
LogUtils.e("getBlackRoomList", response.message());
}
@@ -3075,7 +3078,7 @@ public class RetrofitClient {
});
}
public void roomGetIn(String roomId, String password, BaseObserver<RoomInfoResp> observer) {
public void roomGetIn(String roomId, String password, BaseObserver<RoomInfoResp> observer, JoinRoomErrorListener joinRoomErrorListener) {
if (!isNetworkAvailable()) {
handleNetworkUnavailable(observer);
CommonAppContext.getInstance().isRoomJoininj = false;
@@ -3090,17 +3093,22 @@ public class RetrofitClient {
BaseModel<RoomInfoResp> roomInfoRespBaseModel = response.body();
if (roomInfoRespBaseModel.getCode() == 1) {
observer.onNext(roomInfoRespBaseModel.getData());
} else if (roomInfoRespBaseModel.getCode() == 301) {
setCode301(roomInfoRespBaseModel.getMsg());
} else if (roomInfoRespBaseModel.getCode() == 0) {
ToastUtils.showShort(roomInfoRespBaseModel.getMsg());
if (joinRoomLoadListener != null) {
joinRoomLoadListener.onJoinRoomLoad(roomInfoRespBaseModel.getMsg());
}
} else if (roomInfoRespBaseModel.getCode() == 202) {
observer.onNext(roomInfoRespBaseModel.getData());
} else {
MessageListenerSingleton.getInstance().quitGroup(roomId);
if (roomInfoRespBaseModel.getCode() == 301) {
setCode301(roomInfoRespBaseModel.getMsg());
} else if (roomInfoRespBaseModel.getCode() == 0) {
ToastUtils.showShort(roomInfoRespBaseModel.getMsg());
if (joinRoomLoadListener != null) {
joinRoomLoadListener.onJoinRoomLoad(roomInfoRespBaseModel.getMsg());
}
} else if (roomInfoRespBaseModel.getCode() == 202) {
observer.onNext(roomInfoRespBaseModel.getData());
} else {
MessageListenerSingleton.getInstance().quitGroup(roomId);
}
if (joinRoomErrorListener != null){
joinRoomErrorListener.onJoinRoomError(roomInfoRespBaseModel.getCode(), roomInfoRespBaseModel.getMsg());
}
}
} else {
ToastUtils.showLong("进入房间错误", response.code());
@@ -3143,6 +3151,10 @@ public class RetrofitClient {
} else if (beforeJoinRoomCheckBeanBaseModel.getCode() == 202) {
observer.onNext(beforeJoinRoomCheckBeanBaseModel.getData());
joinRoomLoadListener.onJoinRoomLoad(beforeJoinRoomCheckBeanBaseModel.getMsg());
} else if (beforeJoinRoomCheckBeanBaseModel.getCode() == 101) {
BeforeJoinRoomCheckBean beforeJoinRoomCheckBean = new BeforeJoinRoomCheckBean();
beforeJoinRoomCheckBean.setCode(101);
observer.onNext(beforeJoinRoomCheckBean);
}
} else {
if (joinRoomLoadListener != null) {
@@ -3204,8 +3216,8 @@ public class RetrofitClient {
} else if (listBaseModel.getCode() == 0) {
ToastUtils.showLong(listBaseModel.getMsg());
}
}else {
ToastUtils.showLong("麦位时长数据错误",response.code());
} else {
ToastUtils.showLong("麦位时长数据错误", response.code());
LogUtils.e("getPitTimeList", response.message());
}
}
@@ -3916,8 +3928,8 @@ public class RetrofitClient {
}
public void roomAuctionJoin(String auctionId, String userId, String giftId, String
num, String type,String gift_bag_id, BaseObserver<RoomAuction.AuctionListBean> observer) {
sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type,gift_bag_id)
num, String type, String gift_bag_id, BaseObserver<RoomAuction.AuctionListBean> observer) {
sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type, gift_bag_id)
// .enqueue(new ApiResponseCallback<RoomAuction.AuctionListBean>(CommonAppContext.getInstance()) {
// @Override
// public void onSuccess(RoomAuction.AuctionListBean data) {
@@ -4262,8 +4274,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,String gift_bag_id, BaseObserver<RoomGiftData> observer) {
sApiServer.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id,gift_bag_id).enqueue(new Callback<BaseModel<RoomGiftData>>() {
public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id, String gift_bag_id, BaseObserver<RoomGiftData> observer) {
sApiServer.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id, gift_bag_id).enqueue(new Callback<BaseModel<RoomGiftData>>() {
@Override
public void onResponse(Call<BaseModel<RoomGiftData>> call, Response<BaseModel<RoomGiftData>> response) {
if (response.code() == 200) {
@@ -4410,7 +4422,7 @@ public class RetrofitClient {
}
public void applyPit(String roomId, String pitNumber, BaseObserver<String> observer) {
sApiServer.applyPit(roomId, pitNumber,"").enqueue(new Callback<BaseModel<String>>() {
sApiServer.applyPit(roomId, pitNumber, "").enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
onNextRetu(response, observer);
@@ -4424,8 +4436,8 @@ public class RetrofitClient {
}
// TODO: 2026/1/7 修改了上麦接口,这里重新写一个,是只针对酒吧房使用的
public void applyPubPit(String roomId, String pitNumber,String gift_id, BaseObserver<String> observer) {
sApiServer.applyPit(roomId, pitNumber,gift_id).enqueue(new Callback<BaseModel<String>>() {
public void applyPubPit(String roomId, String pitNumber, String gift_id, BaseObserver<String> observer) {
sApiServer.applyPit(roomId, pitNumber, gift_id).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
onNextRetu(response, observer);
@@ -4438,15 +4450,15 @@ public class RetrofitClient {
});
}
public void liaoTa(String roomId,String toUserId,String type ,BaseObserver<String> observer) {
sApiServer.liaoTa(roomId,toUserId,type).enqueue(new Callback<BaseModel<String>>() {
public void liaoTa(String roomId, String toUserId, String type, BaseObserver<String> observer) {
sApiServer.liaoTa(roomId, toUserId, type).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200) {
onNextRetu(response, observer);
}else {
ToastUtils.showLong("撩Ta失败",response.code());
} else {
ToastUtils.showLong("撩Ta失败", response.code());
LogUtils.e("liaoTa: " + response.message());
}
}
@@ -4704,8 +4716,8 @@ public class RetrofitClient {
});
}
public void setRoomBusinessTime(String roomId,String start_time,String end_time, BaseObserver<String> observer) {
sApiServer.setRoomBusinessTime(roomId,start_time,end_time).enqueue(new Callback<BaseModel<String>>() {
public void setRoomBusinessTime(String roomId, String start_time, String end_time, BaseObserver<String> observer) {
sApiServer.setRoomBusinessTime(roomId, start_time, end_time).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
@@ -4716,10 +4728,10 @@ public class RetrofitClient {
observer.onNext("");
} else if (baseModel.getCode() == 301) {
setCode301(baseModel.getMsg());
}else if (baseModel.getCode() == 0) {
} else if (baseModel.getCode() == 0) {
ToastUtils.showLong(baseModel.getMsg());
}
}else {
} else {
ToastUtils.showLong("设置营业时间失败,", response.code());
LogUtils.e("setRoomBusinessTime", response.message());
}
@@ -5421,8 +5433,8 @@ public class RetrofitClient {
});
}
public void closePkMic(String pk_id ,String type ,String user_id,BaseObserver<String> observer) {
sApiServer.closePkMic(pk_id,type,user_id).enqueue(new Callback<BaseModel<String>>() {
public void closePkMic(String pk_id, String type, String user_id, BaseObserver<String> observer) {
sApiServer.closePkMic(pk_id, type, user_id).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {

View File

@@ -0,0 +1,5 @@
package com.xscm.moduleutil.listener
interface JoinRoomErrorListener {
fun onJoinRoomError(errorCode: Int, errorMsg: String)
}

View File

@@ -410,7 +410,39 @@ public class ImageUtils {
}
}
Glide.with(mImageView).asBitmap().load(path)
.apply(createUrlOnlyOptions(path))
.apply(createUrlOnlyOptions(path)).listener(new RequestListener<Bitmap>() {
@Override
public boolean onResourceReady(Bitmap resource, Object model,
Target<Bitmap> target, DataSource dataSource,
boolean isFirstResource) {
// dataSource 是关键参数!
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
}
return false;
}
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model,
Target<Bitmap> target, boolean isFirstResource) {
Log.e("GlideCache", "加载失败"+"path:"+path, e);
return false;
}
})
.error(R.mipmap.default_avatar).placeholder(R.mipmap.default_avatar).centerCrop()
.thumbnail(0.3f).into(mImageView);
}
@@ -487,6 +519,25 @@ public class ImageUtils {
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
// dataSource 是关键参数!
switch (dataSource) {
case DATA_DISK_CACHE:
case RESOURCE_DISK_CACHE:
LogUtils.e("GlideCache", "来自磁盘缓存",path);
break;
case MEMORY_CACHE:
LogUtils.e("GlideCache", "来自内存缓存",path);
break;
case LOCAL: // 本地文件
LogUtils.e("GlideCache", "来自本地文件",path);
break;
case REMOTE: // 网络下载
LogUtils.e("GlideCache", "来自网络下载",path);
break;
default:
LogUtils.e("GlideCache", "来自: " + dataSource);
}
// 加载成功resource 就是最终的 Bitmap 对象
int imageWidth = resource.getWidth(); // 图片原始宽度
int imageHeight = resource.getHeight(); // 图片原始高度