yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 随机PK

Browse Source
This commit is contained in:
zlzw
2022-12-06 17:40:44 +08:00
parent 29ddc68870
commit e134ef8d54
17 changed files with 917 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/yunbao/common/CommonAppContext.java
View File

@@ -83,6 +83,9 @@ public class CommonAppContext extends MultiDexApplication {
}
public static Activity getTopActivity() {
return activityWeakReference.get();
}
@Override
protected void attachBaseContext(Context base) {
@@ -100,7 +103,7 @@ public class CommonAppContext extends MultiDexApplication {
@Override
public void onActivityStarted(Activity activity) {
mCount++;
activityWeakReference=new WeakReference<>(activity);
activityWeakReference = new WeakReference<>(activity);
if (!mFront) {
mFront = true;
L.e("AppContext------->处于前台");

1
common/src/main/java/com/yunbao/common/Constants.java
View File

@@ -146,6 +146,7 @@ public class Constants {
public static final String SOCKET_ALL_SERVER_NOTIFY = "AllServerNotify";//全服通知
public static final String SOCKET_SEND_BARRAGE = "SendBarrage";//发弹幕
public static final String SOCKET_LIVE_DRPK = "LiveDRPK";//多人PK
public static final String SOCKET_LIVE_DRPK_RANDOM = "LiveRandomPK";//多人PK
public static final String SOCKET_LEAVE_ROOM = "disconnect";//用户离开房间
public static final String SOCKET_LIVE_END = "StartEndLive";//主播关闭直播
public static final String SOCKET_SYSTEM = "SystemNot";//系统消息

23
common/src/main/java/com/yunbao/common/bean/HttpCallbackModel.java Normal file
View File

@@ -0,0 +1,23 @@
package com.yunbao.common.bean;
public class HttpCallbackModel extends BaseModel{
private int code;
private String msg;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
}

89
common/src/main/java/com/yunbao/common/bean/RandomPkUserBean.java Normal file
View File

@@ -0,0 +1,89 @@
package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
/**
* 随机PK UserBean
*/
public class RandomPkUserBean extends UserBean {
@SerializedName("is_pk")
private int pk;
@SerializedName("isattention")
private String attention;
@SerializedName("user_nicename")
private String userNiceName;
public RandomPkUserBean() {
}
public boolean isPk() {
return pk==1;
}
public boolean isAttention() {
return attention.equals("1");
}
public String getAttention() {
return attention;
}
public void setAttention(String attention) {
this.attention = attention;
}
public int getPk() {
return pk;
}
public void setPk(int pk) {
this.pk = pk;
}
@Override
public String getUserNiceName() {
return userNiceName;
}
@Override
public void setUserNiceName(String userNiceName) {
this.userNiceName = userNiceName;
}
@Override
public String toString() {
return "RandomPkUserBean{" +
"pk=" + pk +
", attention='" + attention + '\'' +
", userNiceName='" + userNiceName + '\'' +
", id='" + id + '\'' +
", userNiceName='" + userNiceName + '\'' +
", avatar='" + avatar + '\'' +
", avatarThumb='" + avatarThumb + '\'' +
", sex=" + sex +
", signature='" + signature + '\'' +
", coin='" + coin + '\'' +
", gold='" + gold + '\'' +
", votes='" + votes + '\'' +
", consumption='" + consumption + '\'' +
", votestotal='" + votestotal + '\'' +
", province='" + province + '\'' +
", city='" + city + '\'' +
", location='" + location + '\'' +
", birthday='" + birthday + '\'' +
", level=" + level +
", levelAnchor=" + levelAnchor +
", lives=" + lives +
", follows=" + follows +
", fans=" + fans +
", vip=" + vip +
", liang=" + liang +
", car=" + car +
", medal_level=" + medal_level +
", medal_name='" + medal_name + '\'' +
", Dress=" + Dress +
", noble_id='" + noble_id + '\'' +
", yuanbao='" + yuanbao + '\'' +
'}';
}
}

51
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@@ -9,6 +9,7 @@ import com.yunbao.common.bean.CustomSidebarInfoModel;
import com.yunbao.common.bean.EnterRoomNewModel;
import com.yunbao.common.bean.FaceBookUpModel;
import com.yunbao.common.bean.HourRank;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LinkMicUserBeanV2;
import com.yunbao.common.bean.LiveInfoModel;
@@ -18,6 +19,7 @@ import com.yunbao.common.bean.NewPeopleInfo;
import com.yunbao.common.bean.NobleRankHideUserListModel;
import com.yunbao.common.bean.NobleTrumpetModel;
import com.yunbao.common.bean.PkRankBean;
import com.yunbao.common.bean.RandomPkUserBean;
import com.yunbao.common.bean.SearchModel;
import com.yunbao.common.bean.SetAttentsModel;
import com.yunbao.common.bean.SlideInBannerModel;
@@ -177,7 +179,7 @@ public interface PDLiveApi {
* 获取多人连麦列表
*/
@GET("/api/public/?service=live.getDrLm")
Observable<ResponseModel<List<LinkMicUserBeanV2>>> getDrLm(@Query("uid")String uid);
Observable<ResponseModel<List<LinkMicUserBeanV2>>> getDrLm(@Query("uid") String uid);
/**
* 获取日榜、周榜数据
@@ -286,8 +288,9 @@ public interface PDLiveApi {
Observable<ResponseModel<BaseModel>> delDrLm();
/**
* 多人连麦-踢出用户
* @param uid 对方uid
* 多人连麦-踢出用户
*
* @param uid 对方uid
* @param roomId 当前房间号
*/
@GET("/api/public/?service=Live.killDrLm")
@@ -338,4 +341,46 @@ public interface PDLiveApi {
@Query("GroupId") String GroupId,
@Query("stream") String stream
);
/**
* 获取随机PK开关
*
* @return 1=开，0=关
*/
@GET("/api/public/?service=Livepk.getRandomPKType")
Observable<ResponseModel<List<Integer>>> getRandomPkSwitch();
/**
* 设置随机PK开关
* @param pk 1=开，0=关
*/
@GET("/api/public/?service=Livepk.setRandomPKType")
Observable<ResponseModel<List<BaseModel>>> changeRandomPkSwitch(@Query("random_pk") int pk);
/**
* 获取随机PK次数
*/
@GET("/api/public/?service=Livepk.getRandomPKType")
Observable<ResponseModel<Integer>> getRandomPkNumber();
/**
* 发起随机PK
*/
@GET("/api/public/?service=Livepk.setRandomPK")
Observable<ResponseModel<String>> randomPK();
/**
* 随机PK后调用接口给后台记录
*/
@GET("/api/public/?service=Livepk.startRandomPK")
Observable<ResponseModel<BaseModel>> startRandomPK();
/**
* 自由PK开始后调用接口扣掉次数
*/
@GET("/api/public/?service=Livepk.setActivePkNum")
Observable<ResponseModel<BaseModel>> setRandomPkNum();
/**
* 随机PK搜索用户
* @param cs 简体关键字/uid
* @param ct 繁体关键字/uid
*/
@GET("/api/public/?service=Livepk.searchUser")
Observable<ResponseModel<List<RandomPkUserBean>>> randomPkSearchUser(@Query("jian_key")String cs,@Query("fan_key")String ct);
}

191
common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
View File

@@ -11,6 +11,7 @@ import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.CheckLiveModel;
import com.yunbao.common.bean.CustomSidebarInfoModel;
import com.yunbao.common.bean.EnterRoomNewModel;
import com.yunbao.common.bean.HttpCallbackModel;
import com.yunbao.common.bean.LinkMicUserBean;
import com.yunbao.common.bean.LinkMicUserBeanV2;
import com.yunbao.common.bean.LiveInfoModel;
@@ -18,6 +19,7 @@ import com.yunbao.common.bean.LiveRoomActivityBanner;
import com.yunbao.common.bean.NobleRankHideUserListModel;
import com.yunbao.common.bean.NobleTrumpetModel;
import com.yunbao.common.bean.PkRankBean;
import com.yunbao.common.bean.RandomPkUserBean;
import com.yunbao.common.bean.SetAttentsModel;
import com.yunbao.common.bean.StarChallengeStatusModel;
import com.yunbao.common.bean.VipModel;
@@ -484,6 +486,9 @@ public class LiveNetManager {
private Disposable randomPkApi;
/**
* PK排位赛接口
*/
public void getRandomPk(String mLiveUid, String pkUid, HttpCallback<PkRankBean> callback) {
randomPkApi = API.get().pdLiveApi(mContext)
.getPkRanksList(mLiveUid, pkUid)
@@ -501,6 +506,192 @@ public class LiveNetManager {
});
}
/**
* 获取随机PK开关
* 1=开，0=关
*/
public void getRandomPkSwitch(HttpCallback<Integer> callback) {
API.get().pdLiveApi(mContext)
.getRandomPkSwitch()
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(listResponseModel -> {
if (callback != null) {
callback.onSuccess(listResponseModel.getData().getInfo().get(0));
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 设置随机PK开关
*
* @param pk 1=开，0=关
* @param callback @{@link HttpCallbackModel#getCode()} 0=成功
*/
public void changeRandomPkSwitch(int pk, HttpCallback<HttpCallbackModel> callback) {
API.get().pdLiveApi(mContext)
.changeRandomPkSwitch(pk)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
@Override
public void accept(ResponseModel<List<BaseModel>> responseModel) throws Exception {
if (callback != null) {
HttpCallbackModel model = new HttpCallbackModel();
model.setCode(responseModel.getData().getCode());
model.setMsg(responseModel.getData().getMsg());
callback.onSuccess(model);
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 获取随机PK次数
*/
public void getRandomPkNumber(HttpCallback<Integer> callback) {
API.get().pdLiveApi(mContext)
.getRandomPkNumber()
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<Integer>>() {
@Override
public void accept(ResponseModel<Integer> responseModel) throws Exception {
if (callback != null) {
callback.onSuccess(responseModel.getData().getInfo());
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 发起随机PK
*/
public void randomPK(HttpCallback<String> callback) {
API.get().pdLiveApi(mContext)
.randomPK()
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<String>>() {
@Override
public void accept(ResponseModel<String> responseModel) throws Exception {
if (callback != null) {
callback.onSuccess("36956");
// callback.onSuccess(responseModel.getData().getInfo());
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 自由PK开始后调用接口扣掉次数
*/
public void setRandomPkNum(HttpCallback<HttpCallbackModel> callback) {
API.get().pdLiveApi(mContext)
.setRandomPkNum()
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<BaseModel>>() {
@Override
public void accept(ResponseModel<BaseModel> responseModel) throws Exception {
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 随机PK后调用接口给后台记录
*/
public void startRandomPK(HttpCallback<Boolean> callback) {
API.get().pdLiveApi(mContext)
.startRandomPK()
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<BaseModel>>() {
@Override
public void accept(ResponseModel<BaseModel> responseModel) throws Exception {
if (responseModel.getData().getCode() == 0) {
if (callback != null) {
callback.onSuccess(true);
}
} else {
callback.onSuccess(false);
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 随机PK后调用接口给后台记录
* @param cs 简体关键字/uid
* @param ct 繁体关键字/uid
*/
public void randomPkSearchUser(String cs, String ct, HttpCallback<List<RandomPkUserBean>> callback) {
API.get().pdLiveApi(mContext)
.randomPkSearchUser(cs, ct)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<List<RandomPkUserBean>>>() {
@Override
public void accept(ResponseModel<List<RandomPkUserBean>> responseModel) throws Exception {
if (responseModel.getData().getCode() == 0) {
if (callback != null) {
callback.onSuccess(responseModel.getData().getInfo());
}
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 直播间取消网络请求
*/

79
common/src/main/java/com/yunbao/common/manager/IMRTCManager.java Normal file
View File

@@ -0,0 +1,79 @@
package com.yunbao.common.manager;
import cn.rongcloud.rtc.api.RCRTCRoom;
import cn.rongcloud.rtc.api.callback.IRCRTCResultCallback;
import cn.rongcloud.rtc.base.RTCErrorCode;
/**
* RTC管理类，负责管理申请、同意、拒绝PK
*/
public class IMRTCManager {
private static IMRTCManager manager;
private RCRTCRoom rtcRoom;
private IMRTCManager() {
}
public static IMRTCManager getInstance() {
if (manager == null) {
manager = new IMRTCManager();
}
return manager;
}
public void setRtcRoom(RCRTCRoom rtcRoom) {
this.rtcRoom = rtcRoom;
}
/**
* 响应PK请求
* @param liveUid 对方房间号
* @param agree 是否同意
* @param extra 扩展参数
* @param callback 回调
*/
public void responseJoinOtherRoom(String liveUid, boolean agree, String extra, IRCRTCResultCallback callback) {
if (rtcRoom != null) {
/*
inviterRoomId - 邀请者所在房间 id，
inviterUserId - 邀请者用户 id
agree - 被邀请者是否同意连麦邀请
inviteeAutoMix - 是否将被邀请者音视频资源发送到邀请人房间中合流
1：inviteeAutoMix 为true时：
1.1：如果邀请方在发送连麦请求之前发布了资源，当被邀请方加入邀请者房间成功后，服务器会把邀请方流资源合并到被邀请方视图（默认仅悬浮布局合流）上。
1.2：如果邀请方在发送连麦请求之前没有发布资源，将会在邀请方发布资源成功后，服务器才会把邀请方的资源合并到被邀请方视图（默认仅悬浮布局合流）上。
2: 无论为true或false，双方都可以使用RCRTCLiveInfo.setMixConfig(RCRTCMixConfig, IRCRTCResultCallback) 方法主动设置合流布局。一旦主动设置过合流布局，后续音视频直播过程中设置的自动合流参数将失效。
extra - 扩展字段，默认为空
*/
rtcRoom.getLocalUser().responseJoinOtherRoom(liveUid, liveUid, agree, agree, extra, callback);
} else {
callback.onFailed(RTCErrorCode.RongRTCCodeIMError);
}
}
/**
* 申请PK
* @param liveUid 对方房间号
* @param inviterAutoMix 是否将邀请者音视频资源发送到被邀请人房间中合流
* @param extra 扩展参数
* @param callback 回调
*/
public void requestJoinOtherRoom(String liveUid,boolean inviterAutoMix,String extra,IRCRTCResultCallback callback){
if(rtcRoom!=null){
/*
inviteeRoomId - 被邀请者所在房间 id
inviteeUserId - 被邀请用户 id
inviterAutoMix - 是否将邀请者音视频资源发送到被邀请人房间中合流
1: inviterAutoMix为true时：
1.1：如果被邀请方在加入邀请方房间之前发布了资源，当被邀请方加入邀请者房间成功后，服务器会把被邀请方流资源合并到邀请方视图 ·（默认仅悬浮布局合流）上。
1.2：如果被邀请方在加入邀请方房间之前没有发布过资源，将会在被邀请方发布资源成功后，服务器会把被邀请方流资源合并到邀请方视图（默认仅悬浮布局合流）上。
2:无论为true或false，双方都可以使用RCRTCLiveInfo.setMixConfig(RCRTCMixConfig, IRCRTCResultCallback) 方法主动设置合流布局。一旦主动设置过合流布局，后续音视频直播过程中设置的自动合流参数将失效。
extra - 扩展字段，默认为空
*/
rtcRoom.getLocalUser().requestJoinOtherRoom(liveUid,liveUid,inviterAutoMix,extra,callback);
}else{
callback.onFailed(RTCErrorCode.RongRTCCodeIMError);
}
}
}