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

Merge branch 'dev_prank'

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
This commit is contained in:
zlzw
2022-12-12 14:14:06 +08:00
parent b5247df69b e4c490577d
commit fdbf5aee04
22 changed files with 1800 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
common/src/main/java/com/yunbao/common/bean/PrankGiftBean.java Normal file
View File

@@ -0,0 +1,59 @@
package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
public class PrankGiftBean extends BaseModel{
@SerializedName("prank_content")
private String title;
@SerializedName("gift_name")
private String name;
@SerializedName("gift_icon")
private String icon;
@SerializedName("gift_num")
private int num;
@SerializedName("gift_id")
private String giftId;
public PrankGiftBean() {
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getNum() {
return num;
}
public void setNum(int num) {
this.num = num;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getGiftId() {
return giftId;
}
public void setGiftId(String giftId) {
this.giftId = giftId;
}
}

121
common/src/main/java/com/yunbao/common/bean/PrankHttpTurntableBean.java Normal file
View File

@@ -0,0 +1,121 @@
package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.utils.StringUtil;
public class PrankHttpTurntableBean extends BaseModel {
@SerializedName("id")
private int id;
@SerializedName("anchor_id")
private String anchor_id;
@SerializedName("coin")
private long coin = 1000;
@SerializedName("hope_coin")
private long hopeCoin = 1000;
@SerializedName("turntable_one")
private String turntable1;
@SerializedName("turntable_two")
private String turntable2;
@SerializedName("turntable_three")
private String turntable3;
@SerializedName("turntable_four")
private String turntable4;
@SerializedName("turntable_five")
private String turntable5;
@SerializedName("turntable_six")
private String turntable6;
@SerializedName("status")
private int status;
public PrankHttpTurntableBean() {
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getAnchor_id() {
return anchor_id;
}
public void setAnchor_id(String anchor_id) {
this.anchor_id = anchor_id;
}
public long getCoin() {
return coin;
}
public void setCoin(long coin) {
this.coin = coin;
}
public long getHopeCoin() {
return hopeCoin;
}
public void setHopeCoin(long hopeCoin) {
this.hopeCoin = hopeCoin;
}
public String getTurntable1() {
return turntable1;
}
public void setTurntable1(String turntable1) {
this.turntable1 = turntable1;
}
public String getTurntable2() {
return turntable2;
}
public void setTurntable2(String turntable2) {
this.turntable2 = turntable2;
}
public String getTurntable3() {
return turntable3;
}
public void setTurntable3(String turntable3) {
this.turntable3 = turntable3;
}
public String getTurntable4() {
return turntable4;
}
public void setTurntable4(String turntable4) {
this.turntable4 = turntable4;
}
public String getTurntable5() {
return turntable5;
}
public void setTurntable5(String turntable5) {
this.turntable5 = turntable5;
}
public String getTurntable6() {
return turntable6;
}
public void setTurntable6(String turntable6) {
this.turntable6 = turntable6;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
}

26
common/src/main/java/com/yunbao/common/bean/PrankTurntableBean.java Normal file
View File

@@ -0,0 +1,26 @@
package com.yunbao.common.bean;
public class PrankTurntableBean extends BaseModel {
private int id;
private String context;
public PrankTurntableBean() {
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getContext() {
return context;
}
public void setContext(String context) {
this.context = context;
}
}

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

@@ -20,6 +20,8 @@ import com.yunbao.common.bean.NobleTrumpetModel;
import com.yunbao.common.bean.PkRankBean;
import com.yunbao.common.bean.RandomPkUserBean;
import com.yunbao.common.bean.RankPkInfoBean;
import com.yunbao.common.bean.PrankGiftBean;
import com.yunbao.common.bean.PrankHttpTurntableBean;
import com.yunbao.common.bean.SearchModel;
import com.yunbao.common.bean.SetAttentsModel;
import com.yunbao.common.bean.SlideInBannerModel;
@@ -393,4 +395,61 @@ public interface PDLiveApi {
*/
@GET("/api/public/?service=Ranking.getRankingInfo")
Observable<ResponseModel<RankPkInfoBean>> getRankingInfo();
/**
* 获取转盘整蛊列表
*/
@GET("/api/public/?service=Prank.getAnchorPrankTurntable")
Observable<ResponseModel<PrankHttpTurntableBean>> getAnchorPrankTurntable(
@Query("anchor_id") String anchor_id
);
/**
* 提交整蛊
*/
@GET("/api/public/?service=Prank.setAnchorPrankTurntable")
Observable<ResponseModel<List<BaseModel>>> setAnchorPrankTurntable(
@Query("anchor_id") String anchor_id,
@Query("coin") String coin,
@Query("turntable_one") String turntable_one,
@Query("turntable_two") String turntable_two,
@Query("turntable_three") String turntable_three,
@Query("turntable_four") String turntable_four,
@Query("turntable_five") String turntable_five,
@Query("turntable_six") String turntable_six,
@Query("status") String status
);
/**
* 转盘整蛊结束后调用的接口
*/
@GET("/api/public/?service=Prank.endPrankTurntable")
Observable<ResponseModel<List<BaseModel>>> endPrankTurntable(
@Query("anchor_id") String anchor_id
);
/**
* 获取整蛊列表
*/
@GET("/api/public/?service=Prank.prankList")
Observable<ResponseModel<List<PrankGiftBean>>> prankList( @Query("anchor_id") String anchor_id);
/**
* 设置礼物整蛊
*/
@GET("/api/public/?service=Prank.setPrank")
Observable<ResponseModel<List<BaseModel>>> setPrank(
@Query("anchor_id") String anchor_id,
@Query("gift_id") String gift_id,
@Query("gift_num") String gift_num,
@Query("prank_content") String prank_content
);
/**
* 删除礼物整蛊
*/
@GET("/api/public/?service=Prank.deletePrank")
Observable<ResponseModel<List<BaseModel>>> deletePrank(
@Query("anchor_id") String anchor_id,
@Query("prank_index") String prank_index
);
}

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

@@ -19,6 +19,9 @@ 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.PrankGiftBean;
import com.yunbao.common.bean.PrankHttpTurntableBean;
import com.yunbao.common.bean.PrankTurntableBean;
import com.yunbao.common.bean.RandomPkUserBean;
import com.yunbao.common.bean.RankPkInfoBean;
import com.yunbao.common.bean.SetAttentsModel;
@@ -36,6 +39,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import retrofit2.http.Query;
/**
@@ -742,6 +746,158 @@ public class LiveNetManager {
}).isDisposed();
}
/**
* 获取转盘整蛊列表
*/
public void getAnchorPrankTurntable(String mLiveUid, HttpCallback<PrankHttpTurntableBean> callback) {
API.get().pdLiveApi(mContext)
.getAnchorPrankTurntable(mLiveUid)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(responseModel -> {
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();
}
/**
* 提交转盘整蛊
*/
public void setAnchorPrankTurntable(String mLiveUid, String coin,
String turntable_one,
String turntable_two,
String turntable_three,
String turntable_four,
String turntable_five,
String turntable_six,
String status,
HttpCallback<Object> callback) {
API.get().pdLiveApi(mContext)
.setAnchorPrankTurntable(mLiveUid,
coin,
turntable_one,
turntable_two,
turntable_three,
turntable_four,
turntable_five,
turntable_six,
status)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
@Override
public void accept(ResponseModel<List<BaseModel>> listResponseModel) throws Exception {
if (callback != null) {
callback.onSuccess("");
}
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 获取转盘整蛊列表
*/
public void getPrankGiftList(String mLiveUid, HttpCallback<List<PrankGiftBean>> callback) {
API.get().pdLiveApi(mContext)
.prankList(mLiveUid)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(responseModel -> {
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();
}
/**
* 设置礼物整蛊
*/
public void setPrankGift(String mLiveUid, String gift_id, String gift_num, String prank_content, HttpCallback<PrankHttpTurntableBean> callback) {
API.get().pdLiveApi(mContext)
.setPrank(mLiveUid, gift_id, gift_num, prank_content)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(responseModel -> {
if (callback != null) {
callback.onSuccess(null);
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 删除礼物整蛊
*/
public void deletePrankGift(String mLiveUid, String prank_index, HttpCallback<PrankHttpTurntableBean> callback) {
API.get().pdLiveApi(mContext)
.deletePrank(mLiveUid, prank_index)
.observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io())
.subscribe(responseModel -> {
if (callback != null) {
callback.onSuccess(null);
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 整蛊结束
*/
public void endPrankTurntable(String mLiveUid,HttpCallback<BaseModel> callback){
API.get().pdLiveApi(mContext)
.endPrankTurntable(mLiveUid)
.subscribeOn(Schedulers.io())
.subscribe(responseModel -> {
if (callback != null) {
callback.onSuccess(null);
}
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
if (callback != null) {
callback.onError(throwable.getMessage());
}
}
}).isDisposed();
}
/**
* 直播间取消网络请求
*/