1：修改拍卖房转盘问题
2：添加转盘参数竞拍问题
This commit is contained in:
@@ -16,68 +16,7 @@ import com.franmontiel.persistentcookiejar.cache.SetCookieCache;
|
||||
import com.franmontiel.persistentcookiejar.persistence.SharedPrefsCookiePersistor;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.xscm.moduleutil.base.CommonAppContext;
|
||||
import com.xscm.moduleutil.bean.AlbumBean;
|
||||
import com.xscm.moduleutil.bean.AppPay;
|
||||
import com.xscm.moduleutil.bean.AppUpdateModel;
|
||||
import com.xscm.moduleutil.bean.BannerModel;
|
||||
import com.xscm.moduleutil.bean.BindDetail;
|
||||
import com.xscm.moduleutil.bean.BindType;
|
||||
import com.xscm.moduleutil.bean.BlackUserBean;
|
||||
import com.xscm.moduleutil.bean.CharmRankingResp;
|
||||
import com.xscm.moduleutil.bean.CircleListBean;
|
||||
import com.xscm.moduleutil.bean.CommentBean;
|
||||
import com.xscm.moduleutil.bean.ExpandColumnBean;
|
||||
import com.xscm.moduleutil.bean.FirstChargeBean;
|
||||
import com.xscm.moduleutil.bean.FirstChargeGiftBean;
|
||||
import com.xscm.moduleutil.bean.GiftBean;
|
||||
import com.xscm.moduleutil.bean.GiftBoxBean;
|
||||
import com.xscm.moduleutil.bean.GiftBoxRecordBean;
|
||||
import com.xscm.moduleutil.bean.GiftLabelBean;
|
||||
import com.xscm.moduleutil.bean.GiftName;
|
||||
import com.xscm.moduleutil.bean.GiftPackBean;
|
||||
import com.xscm.moduleutil.bean.GiftPackListCount;
|
||||
import com.xscm.moduleutil.bean.GiftUserWallBean;
|
||||
import com.xscm.moduleutil.bean.HeadlineBean;
|
||||
import com.xscm.moduleutil.bean.HeatedBean;
|
||||
import com.xscm.moduleutil.bean.HostBean;
|
||||
import com.xscm.moduleutil.bean.MusicSongBean;
|
||||
import com.xscm.moduleutil.bean.MyBagDataBean;
|
||||
import com.xscm.moduleutil.bean.MyCpRoom;
|
||||
import com.xscm.moduleutil.bean.MyFootResp;
|
||||
import com.xscm.moduleutil.bean.MyRoomBean;
|
||||
import com.xscm.moduleutil.bean.NewsDataBean;
|
||||
import com.xscm.moduleutil.bean.NewsMessageList;
|
||||
import com.xscm.moduleutil.bean.PersonaltyBean;
|
||||
import com.xscm.moduleutil.bean.PkSwTokenBean;
|
||||
import com.xscm.moduleutil.bean.PlaceholderBean;
|
||||
import com.xscm.moduleutil.bean.RealNameBean;
|
||||
import com.xscm.moduleutil.bean.RechargeBean;
|
||||
import com.xscm.moduleutil.bean.RelationCardBean;
|
||||
import com.xscm.moduleutil.bean.RevenueBean;
|
||||
import com.xscm.moduleutil.bean.RewardUserBean;
|
||||
import com.xscm.moduleutil.bean.RoomBgBean;
|
||||
import com.xscm.moduleutil.bean.RoomCharmRankBean;
|
||||
import com.xscm.moduleutil.bean.RoomDetails;
|
||||
import com.xscm.moduleutil.bean.RoomRelationBean;
|
||||
import com.xscm.moduleutil.bean.RoomSearchResp;
|
||||
import com.xscm.moduleutil.bean.RoomSingleton;
|
||||
import com.xscm.moduleutil.bean.RoomSubsidy;
|
||||
import com.xscm.moduleutil.bean.RoomSubsidyDetails;
|
||||
import com.xscm.moduleutil.bean.RoomTime;
|
||||
import com.xscm.moduleutil.bean.RoomTypeModel;
|
||||
import com.xscm.moduleutil.bean.RoomUserCharmListBean;
|
||||
import com.xscm.moduleutil.bean.RoonGiftModel;
|
||||
import com.xscm.moduleutil.bean.SearchAll;
|
||||
import com.xscm.moduleutil.bean.SongMusicBean;
|
||||
import com.xscm.moduleutil.bean.ThemeBean;
|
||||
import com.xscm.moduleutil.bean.TopRoom;
|
||||
import com.xscm.moduleutil.bean.UserBean;
|
||||
import com.xscm.moduleutil.bean.UserInfo;
|
||||
import com.xscm.moduleutil.bean.UserOnlineStatusBean;
|
||||
import com.xscm.moduleutil.bean.UserTagBean;
|
||||
import com.xscm.moduleutil.bean.WalletBean;
|
||||
import com.xscm.moduleutil.bean.WalletConfig;
|
||||
import com.xscm.moduleutil.bean.WithdrawalBean;
|
||||
import com.xscm.moduleutil.bean.*;
|
||||
import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
|
||||
import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
|
||||
import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean;
|
||||
@@ -1265,13 +1204,22 @@ public class RetrofitClient {
|
||||
BaseModel<RealNameBean> baseModel = response.body();
|
||||
if (baseModel.getCode() == 1) {
|
||||
observer.onNext(baseModel.getData());
|
||||
}else if (baseModel.getCode() == 0){
|
||||
ToastUtils.showShort(baseModel.getMsg());
|
||||
}else if (baseModel.getCode() == 301){
|
||||
try {
|
||||
CommonAppContext.getInstance().clearLoginInfo();
|
||||
ToastUtils.showShort(baseModel.getMsg());
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Call<BaseModel<RealNameBean>> call, Throwable t) {
|
||||
|
||||
t.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1397,11 +1345,11 @@ public class RetrofitClient {
|
||||
observer.onNext(null);
|
||||
}else if (listBaseModel.getCode()==301){
|
||||
try {
|
||||
ToastUtils.showShort(listBaseModel.getMsg());
|
||||
CommonAppContext.getInstance().clearLoginInfo();
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
ToastUtils.showShort(listBaseModel.getMsg());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1430,11 +1378,12 @@ public class RetrofitClient {
|
||||
observer.onNext(null);
|
||||
}else if (listBaseModel.getCode()==301){
|
||||
try {
|
||||
ToastUtils.showShort(listBaseModel.getMsg());
|
||||
CommonAppContext.getInstance().clearLoginInfo();
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
ToastUtils.showShort(listBaseModel.getMsg());
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1459,10 +1408,11 @@ public class RetrofitClient {
|
||||
}else if (listBaseModel.getCode() == 301) {
|
||||
try {
|
||||
CommonAppContext.getInstance().clearLoginInfo();
|
||||
ToastUtils.showShort(listBaseModel.getMsg());
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
ToastUtils.showShort(listBaseModel.getMsg());
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1965,8 +1915,7 @@ public class RetrofitClient {
|
||||
});
|
||||
}
|
||||
|
||||
public void getRoomOnline(String roomId, String page, String
|
||||
page_limit, BaseObserver<RoomOnline> observer) {
|
||||
public void getRoomOnline(String roomId, String page, String page_limit, BaseObserver<RoomOnline> observer) {
|
||||
sApiServer.getRoomOnline(roomId, page, page_limit).enqueue(new Callback<BaseModel<RoomOnline>>() {
|
||||
@Override
|
||||
public void onResponse(Call<BaseModel<RoomOnline>> call, Response<BaseModel<RoomOnline>> response) {
|
||||
@@ -1985,6 +1934,33 @@ public class RetrofitClient {
|
||||
});
|
||||
}
|
||||
|
||||
public void activitiesPermission(BaseObserver<ActivitiesPermission> observer){
|
||||
sApiServer.activitiesPermission().enqueue(new Callback<BaseModel<ActivitiesPermission>>() {
|
||||
@Override
|
||||
public void onResponse(Call<BaseModel<ActivitiesPermission>> call, Response<BaseModel<ActivitiesPermission>> response) {
|
||||
if (response.code() == 200) {
|
||||
BaseModel<ActivitiesPermission> activitiesPermissionBaseModel = response.body();
|
||||
if (activitiesPermissionBaseModel.getCode() == 1) {
|
||||
observer.onNext(activitiesPermissionBaseModel.getData());
|
||||
}else if (activitiesPermissionBaseModel.getCode()==0){
|
||||
ToastUtils.showShort(activitiesPermissionBaseModel.getMsg());
|
||||
}else if (activitiesPermissionBaseModel.getCode()==301){
|
||||
try {
|
||||
CommonAppContext.getInstance().clearLoginInfo();
|
||||
ToastUtils.showShort(activitiesPermissionBaseModel.getMsg());
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void onFailure(Call<BaseModel<ActivitiesPermission>> call, Throwable t) {
|
||||
t.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void wallet(BaseObserver<WalletBean> observer) {
|
||||
sApiServer.wallet().enqueue(new Callback<BaseModel<WalletBean>>() {
|
||||
@Override
|
||||
@@ -2282,7 +2258,11 @@ public class RetrofitClient {
|
||||
sApiServer.roomAuctionJoin(auctionId, userId, giftId, num, type).enqueue(new ApiResponseCallback<RoomAuction.AuctionListBean>(CommonAppContext.getInstance()) {
|
||||
@Override
|
||||
public void onSuccess(RoomAuction.AuctionListBean data) {
|
||||
observer.onNext(data);
|
||||
if (data != null) {
|
||||
observer.onNext(data);
|
||||
}else {
|
||||
observer.onNext(new RoomAuction.AuctionListBean());
|
||||
}
|
||||
}
|
||||
});
|
||||
// .enqueue(new Callback<BaseModel<RoomAuction.AuctionListBean>>() {
|
||||
@@ -2543,6 +2523,27 @@ public class RetrofitClient {
|
||||
});
|
||||
}
|
||||
|
||||
public void getDayDropGift(BaseObserver<HeavenGiftBean> observer){
|
||||
sApiServer.getDayDropGift().enqueue(new Callback<BaseModel<HeavenGiftBean>>() {
|
||||
@Override
|
||||
public void onResponse(Call<BaseModel<HeavenGiftBean>> call, Response<BaseModel<HeavenGiftBean>> response) {
|
||||
if (response.code()==200){
|
||||
BaseModel<HeavenGiftBean> data = response.body();
|
||||
if (data.getCode()==1){
|
||||
observer.onNext(data.getData());
|
||||
}else if (data.getCode()==0){
|
||||
ToastUtils.showShort(data.getMsg());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Call<BaseModel<HeavenGiftBean>> call, Throwable t) {
|
||||
t.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void firstChargeGift(BaseObserver<FirstChargeGiftBean> observer) {
|
||||
// sApiServer.firstChargeGift().compose(new DefaultTransformer<>()).subscribe(observer);
|
||||
sApiServer.firstChargeGift().enqueue(new Callback<BaseModel<FirstChargeGiftBean>>() {
|
||||
@@ -2558,63 +2559,28 @@ public class RetrofitClient {
|
||||
|
||||
@Override
|
||||
public void onFailure(Call<BaseModel<FirstChargeGiftBean>> call, Throwable t) {
|
||||
|
||||
t.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void getNewChargeGift(BaseObserver<FirstChargeGiftBean> observer) {
|
||||
sApiServer.getNewChargeGift().enqueue(new Callback<BaseModel<FirstChargeGiftBean>>() {
|
||||
@Override
|
||||
public void onResponse(Call<BaseModel<FirstChargeGiftBean>> call, Response<BaseModel<FirstChargeGiftBean>> response) {
|
||||
if (response.code() == 200) {
|
||||
BaseModel<FirstChargeGiftBean> data = response.body();
|
||||
if (data.getCode() == 1) {
|
||||
observer.onNext(data.getData());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Call<BaseModel<FirstChargeGiftBean>> call, Throwable t) {
|
||||
t.printStackTrace();
|
||||
}
|
||||
});
|
||||
// .enqueue(new Callback<ResponseBody>() {
|
||||
// @Override
|
||||
// public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
|
||||
// if (response.code() == 200) {
|
||||
// try {
|
||||
// String json = response.body().string();
|
||||
// BaseModel<FirstChargeGiftBean> data =GsonUtils.fromJson(json, BaseModel.class);
|
||||
//// String data1=GsonUtils.toJson(data.getData());
|
||||
//// LogUtils.e("data1",data.getData());
|
||||
//// FirstChargeGiftBean firstChargeGiftBean=new FirstChargeGiftBean();
|
||||
//// firstChargeGiftBean.setName(data.getData().getName());
|
||||
//// List<FirstChargeGiftBean.GiftBag> giftBags=new ArrayList<>();
|
||||
//// for (int i=0;i<data.getData().getGift_bag().size();i++){
|
||||
////
|
||||
//// FirstChargeGiftBean.GiftBag giftBag=new FirstChargeGiftBean.GiftBag();
|
||||
//// giftBag.setName(data.getData().getGift_bag().get(i).getName());
|
||||
//// giftBag.setMoney(data.getData().getGift_bag().get(i).getMoney());
|
||||
//// giftBag.setTitle1(data.getData().getGift_bag().get(i).getTitle1());
|
||||
//// giftBag.setTitle2(data.getData().getGift_bag().get(i).getTitle2());
|
||||
//// List<RoonGiftModel> roonGiftModels=new ArrayList<>();
|
||||
//// for (int j=0;j<data.getData().getGift_bag().get(i).getGift_list().size();j++){
|
||||
//// RoonGiftModel roonGiftModel=new RoonGiftModel();
|
||||
//// roonGiftModel.setGift_name(data.getData().getGift_bag().get(i).getGift_list().get(j).getGift_name());
|
||||
//// roonGiftModel.setNum(data.getData().getGift_bag().get(i).getGift_list().get(j).getNum());
|
||||
//// roonGiftModel.setGift_price(data.getData().getGift_bag().get(i).getGift_list().get(j).getGift_price());
|
||||
//// roonGiftModel.setType(data.getData().getGift_bag().get(i).getGift_list().get(j).getType());
|
||||
//// roonGiftModel.setBase_image(data.getData().getGift_bag().get(i).getGift_list().get(j).getBase_image());
|
||||
//// roonGiftModels.add(roonGiftModel);
|
||||
//// }
|
||||
//// giftBag.setGift_list(roonGiftModels);
|
||||
//// giftBags.add(giftBag);
|
||||
//// }
|
||||
////
|
||||
//// firstChargeGiftBean.setGift_bag(giftBags);
|
||||
//
|
||||
//
|
||||
//
|
||||
//// List<FirstChargeGiftBean> data2=GsonUtils.fromJson(data1, new TypeToken<List<FirstChargeGiftBean>>(){}.getType());
|
||||
//// observer.onNext(data2.get(0));
|
||||
//// FirstChargeGiftBean firstChargeGiftBean = GsonUtils.fromJson(data1, FirstChargeGiftBean.class);
|
||||
//// Object data3=GsonUtils.fromJson(data1, FirstChargeGiftBean.class);
|
||||
//// LogUtils.e("data3",data3);
|
||||
// observer.onNext(data.getData());
|
||||
// }catch (Exception e){
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void onFailure(Call<ResponseBody> call, Throwable t) {
|
||||
// t.printStackTrace();
|
||||
// }
|
||||
// });
|
||||
}
|
||||
|
||||
public void applyPit(String roomId, String pitNumber, BaseObserver<String> observer) {
|
||||
@@ -3599,9 +3565,8 @@ public class RetrofitClient {
|
||||
}
|
||||
|
||||
/// 盲盒转盘抽奖
|
||||
public void drawGiftList(String giftBagId, String gift_user_ids, String roomId, String
|
||||
num, String heart_id, BaseObserver<BlindReslutBean> observer) {
|
||||
sApiServer.drawGiftList(giftBagId, gift_user_ids, roomId, num, heart_id).enqueue(new Callback<BaseModel<BlindReslutBean>>() {
|
||||
public void drawGiftList(String giftBagId, String gift_user_ids, String roomId, String num, String heart_id,String auction_id, BaseObserver<BlindReslutBean> observer) {
|
||||
sApiServer.drawGiftList(giftBagId, gift_user_ids, roomId, num, heart_id, auction_id).enqueue(new Callback<BaseModel<BlindReslutBean>>() {
|
||||
@Override
|
||||
public void onResponse(Call<BaseModel<BlindReslutBean>> call, Response<BaseModel<BlindReslutBean>> response) {
|
||||
if (response.code() == 200) {
|
||||
|
||||
Reference in New Issue
Block a user