Merge remote-tracking branch 'origin/master'

This commit is contained in:
zlzw 2023-06-03 14:13:47 +08:00
commit 9926997fd7
3 changed files with 5 additions and 5 deletions

View File

@ -400,7 +400,7 @@ public interface PDLiveApi {
* 自由PK开始后调用接口扣掉次数 * 自由PK开始后调用接口扣掉次数
*/ */
@GET("/api/public/?service=Livepk.setActivePkNum") @GET("/api/public/?service=Livepk.setActivePkNum")
Observable<ResponseModel<BaseModel>> setFreePkNum(); Observable<ResponseModel<List<BaseModel>>> setFreePkNum();
/** /**
* 随机PK搜索用户 * 随机PK搜索用户

View File

@ -639,9 +639,9 @@ public class LiveNetManager {
.setFreePkNum() .setFreePkNum()
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribe(new Consumer<ResponseModel<BaseModel>>() { .subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
@Override @Override
public void accept(ResponseModel<BaseModel> responseModel) throws Exception { public void accept(ResponseModel<List<BaseModel>> listResponseModel) throws Exception {
} }
}, new Consumer<Throwable>() { }, new Consumer<Throwable>() {

View File

@ -9,9 +9,9 @@ ext {
] ]
manifestPlaceholders = [ manifestPlaceholders = [
// //
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// //
serverHost : "https://ceshi.yaoulive.com", // serverHost : "https://ceshi.yaoulive.com",
// //
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",