add 新增红包专区
add 新增红包专区进去是只有发放红包的直播间 add 新增首页红包浮窗 add 新增红包记录
This commit is contained in:
@@ -17,6 +17,8 @@ public class AnchorRecommendModel extends BaseModel {
|
||||
//是否展示0=不展示1=展示
|
||||
@SerializedName("list_show")
|
||||
private int listShow = 0;
|
||||
@SerializedName("red_packet_show")
|
||||
private int showRedPacket = 0;//是否显示首页红包浮窗
|
||||
//是否支持换一批0=不支持 1=支持
|
||||
@SerializedName("up_show")
|
||||
private int upShow = 0;
|
||||
@@ -24,6 +26,10 @@ public class AnchorRecommendModel extends BaseModel {
|
||||
private List<AnchorRecommendItemModel> list = new ArrayList<>();
|
||||
@SerializedName("slide")
|
||||
private List<SlideInfoModel> slide = new ArrayList<>();
|
||||
@SerializedName("red_packet_total")
|
||||
private int redPacketTotal = 100;
|
||||
@SerializedName("red_packet_day_create_num")
|
||||
private int redPacketNum = 0;
|
||||
|
||||
public List<SlideInfoModel> getSlide() {
|
||||
return slide;
|
||||
@@ -52,6 +58,30 @@ public class AnchorRecommendModel extends BaseModel {
|
||||
return this;
|
||||
}
|
||||
|
||||
public int getShowRedPacket() {
|
||||
return showRedPacket;
|
||||
}
|
||||
|
||||
public void setShowRedPacket(int showRedPacket) {
|
||||
this.showRedPacket = showRedPacket;
|
||||
}
|
||||
|
||||
public int getRedPacketTotal() {
|
||||
return redPacketTotal;
|
||||
}
|
||||
|
||||
public void setRedPacketTotal(int redPacketTotal) {
|
||||
this.redPacketTotal = redPacketTotal;
|
||||
}
|
||||
|
||||
public int getRedPacketNum() {
|
||||
return redPacketNum;
|
||||
}
|
||||
|
||||
public void setRedPacketNum(int redPacketNum) {
|
||||
this.redPacketNum = redPacketNum;
|
||||
}
|
||||
|
||||
public List<AnchorRecommendItemModel> getList() {
|
||||
return list;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
package com.yunbao.common.bean;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import com.yunbao.common.CommonAppConfig;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class RedPacketDetailsBean extends BaseModel {
|
||||
@SerializedName("u_nicename")
|
||||
private String niceName;
|
||||
@SerializedName("avatar_thumb")
|
||||
private String avatarThumb;
|
||||
@SerializedName("avatar")
|
||||
private String avatar;
|
||||
@SerializedName("red_packet_money")
|
||||
private long money;// 红包金豆总数量
|
||||
@SerializedName("red_packet_quantity")
|
||||
private int quantity; // 领取的红包总数量
|
||||
@SerializedName("red_packet_quantity_already")
|
||||
private int already; // 领取的红包总数量
|
||||
@SerializedName("red_packet_record_details")
|
||||
private List<Detail> details;
|
||||
|
||||
public String getNiceName() {
|
||||
return niceName;
|
||||
}
|
||||
|
||||
public void setNiceName(String niceName) {
|
||||
this.niceName=niceName;
|
||||
}
|
||||
|
||||
public String getAvatarThumb() {
|
||||
avatarThumb=avatarThumb.replace("\\","");
|
||||
if(!avatarThumb.startsWith("http")){
|
||||
avatarThumb= CommonAppConfig.HOST+"/"+avatarThumb;
|
||||
}
|
||||
return avatarThumb;
|
||||
}
|
||||
|
||||
public void setAvatarThumb(String avatarThumb) {
|
||||
this.avatarThumb = avatarThumb;
|
||||
}
|
||||
|
||||
public String getAvatar() {
|
||||
return avatar;
|
||||
}
|
||||
|
||||
public void setAvatar(String avatar) {
|
||||
this.avatar = avatar;
|
||||
}
|
||||
|
||||
public long getMoney() {
|
||||
return money;
|
||||
}
|
||||
|
||||
public void setMoney(long money) {
|
||||
this.money = money;
|
||||
}
|
||||
|
||||
public int getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(int quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public int getAlready() {
|
||||
return already;
|
||||
}
|
||||
|
||||
public void setAlready(int already) {
|
||||
this.already = already;
|
||||
}
|
||||
|
||||
public List<Detail> getDetails() {
|
||||
return details;
|
||||
}
|
||||
|
||||
public void setDetails(List<Detail> details) {
|
||||
this.details = details;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "RedPacketDetailsBean{" +
|
||||
"niceName='" + niceName + '\'' +
|
||||
", avatarThumb='" + avatarThumb + '\'' +
|
||||
", avatar='" + avatar + '\'' +
|
||||
", money=" + money +
|
||||
", quantity=" + quantity +
|
||||
", already=" + already +
|
||||
", details=" + details +
|
||||
'}';
|
||||
}
|
||||
|
||||
public static class Detail extends BaseModel {
|
||||
@SerializedName("receive_money")
|
||||
private long money;
|
||||
@SerializedName("user_nicename")
|
||||
private String niceName;
|
||||
@SerializedName("receive_time")
|
||||
private String time;
|
||||
@SerializedName("avatar_thumb")
|
||||
private String avatarThumb;
|
||||
@SerializedName("avatar")
|
||||
private String avatar;
|
||||
|
||||
|
||||
public long getMoney() {
|
||||
return money;
|
||||
}
|
||||
|
||||
public void setMoney(long money) {
|
||||
this.money = money;
|
||||
}
|
||||
|
||||
public String getNiceName() {
|
||||
return niceName;
|
||||
}
|
||||
|
||||
public void setNiceName(String niceName) {
|
||||
this.niceName=niceName;
|
||||
}
|
||||
|
||||
public String getTime() {
|
||||
return time;
|
||||
}
|
||||
|
||||
public void setTime(String time) {
|
||||
this.time = time;
|
||||
}
|
||||
|
||||
public String getAvatarThumb() {
|
||||
avatarThumb=avatarThumb.replace("\\","");
|
||||
if(!avatarThumb.startsWith("http")){
|
||||
avatarThumb= CommonAppConfig.HOST+"/"+avatarThumb;
|
||||
}
|
||||
return avatarThumb;
|
||||
}
|
||||
|
||||
public void setAvatarThumb(String avatarThumb) {
|
||||
this.avatarThumb = avatarThumb;
|
||||
}
|
||||
|
||||
public String getAvatar() {
|
||||
return avatar;
|
||||
}
|
||||
|
||||
public void setAvatar(String avatar) {
|
||||
this.avatar = avatar;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Detail{" +
|
||||
"money=" + money +
|
||||
", niceName='" + niceName + '\'' +
|
||||
", time='" + time + '\'' +
|
||||
", avatarThumb='" + avatarThumb + '\'' +
|
||||
", avatar='" + avatar + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
package com.yunbao.common.bean;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class RedPacketListBean extends BaseModel {
|
||||
public static final int RED_PACKET_STATUS_SUCCESS=1;//红包消费
|
||||
public static final int RED_PACKET_STATUS_BACK=2;//红包退回
|
||||
public static final int RED_PACKET_CURRENT_STATUS_SUCCESS=1;//红包已生效
|
||||
public static final int RED_PACKET_CURRENT_STATUS_TIMEOUT=2;//红包已过期
|
||||
@SerializedName("id")
|
||||
private int id;
|
||||
@SerializedName("live_nicename")
|
||||
private String liveNicename;
|
||||
@SerializedName("create_time")
|
||||
private String createTime;
|
||||
@SerializedName("red_packet_money")
|
||||
private long redPacketMoney;
|
||||
@SerializedName("red_packet_status")
|
||||
private int redPacketStatus;
|
||||
@SerializedName("current_status")
|
||||
private int currentStatus;
|
||||
@SerializedName("uid")
|
||||
private long uid;
|
||||
|
||||
@SerializedName("amount_diamond")
|
||||
private long amountDiamond;
|
||||
@SerializedName("amount_refund")
|
||||
private long amountRefund;
|
||||
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getLiveNicename() {
|
||||
return liveNicename;
|
||||
}
|
||||
|
||||
public void setLiveNicename(String liveNicename) {
|
||||
this.liveNicename = liveNicename;
|
||||
}
|
||||
|
||||
public String getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
public void setCreateTime(String createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
public long getRedPacketMoney() {
|
||||
return redPacketMoney;
|
||||
}
|
||||
|
||||
public void setRedPacketMoney(long redPacketMoney) {
|
||||
this.redPacketMoney = redPacketMoney;
|
||||
}
|
||||
|
||||
public int getRedPacketStatus() {
|
||||
return redPacketStatus;
|
||||
}
|
||||
|
||||
public void setRedPacketStatus(int redPacketStatus) {
|
||||
this.redPacketStatus = redPacketStatus;
|
||||
}
|
||||
|
||||
public long getUid() {
|
||||
return uid;
|
||||
}
|
||||
|
||||
public void setUid(long uid) {
|
||||
this.uid = uid;
|
||||
}
|
||||
|
||||
public int getCurrentStatus() {
|
||||
return currentStatus;
|
||||
}
|
||||
|
||||
public void setCurrentStatus(int currentStatus) {
|
||||
this.currentStatus = currentStatus;
|
||||
}
|
||||
|
||||
public long getAmountDiamond() {
|
||||
return amountDiamond;
|
||||
}
|
||||
|
||||
public void setAmountDiamond(long amountDiamond) {
|
||||
this.amountDiamond = amountDiamond;
|
||||
}
|
||||
|
||||
public long getAmountRefund() {
|
||||
return amountRefund;
|
||||
}
|
||||
|
||||
public void setAmountRefund(long amountRefund) {
|
||||
this.amountRefund = amountRefund;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "RedPacketListBean{" +
|
||||
"id=" + id +
|
||||
", liveNicename='" + liveNicename + '\'' +
|
||||
", createTime='" + createTime + '\'' +
|
||||
", redPacketMoney=" + redPacketMoney +
|
||||
", redPacketStatus=" + redPacketStatus +
|
||||
", currentStatus=" + currentStatus +
|
||||
", uid=" + uid +
|
||||
", amountDiamond=" + amountDiamond +
|
||||
", amountRefund=" + amountRefund +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package com.yunbao.common.http;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.yunbao.common.bean.ActiveModel;
|
||||
import com.yunbao.common.bean.AnchorRecommendItemModel;
|
||||
import com.yunbao.common.bean.AnchorRecommendModel;
|
||||
import com.yunbao.common.bean.BaseModel;
|
||||
import com.yunbao.common.bean.BlindBoxInfoModel;
|
||||
@@ -19,6 +20,7 @@ import com.yunbao.common.bean.ListInfoMessageModel;
|
||||
import com.yunbao.common.bean.LiveAiRobotBean;
|
||||
import com.yunbao.common.bean.LiveAnchorCallMeModel;
|
||||
import com.yunbao.common.bean.LiveAnchorSayModel;
|
||||
import com.yunbao.common.bean.LiveBean;
|
||||
import com.yunbao.common.bean.LiveDataInfoModel;
|
||||
import com.yunbao.common.bean.LiveInfoModel;
|
||||
import com.yunbao.common.bean.LiveRoomActivityBanner;
|
||||
@@ -35,6 +37,8 @@ import com.yunbao.common.bean.PrankGiftBean;
|
||||
import com.yunbao.common.bean.PrankHttpTurntableBean;
|
||||
import com.yunbao.common.bean.RandomPkUserBean;
|
||||
import com.yunbao.common.bean.RankPkInfoBean;
|
||||
import com.yunbao.common.bean.RedPacketDetailsBean;
|
||||
import com.yunbao.common.bean.RedPacketListBean;
|
||||
import com.yunbao.common.bean.SearchModel;
|
||||
import com.yunbao.common.bean.SetAttentsModel;
|
||||
import com.yunbao.common.bean.SlideInBannerModel;
|
||||
@@ -730,4 +734,23 @@ public interface PDLiveApi {
|
||||
*/
|
||||
@GET("/api/public/?service=Live.getBlindBoxInfo")
|
||||
Observable<ResponseModel<List<BlindBoxInfoModel>>> getBlindBoxInfo();
|
||||
|
||||
/**
|
||||
* 获取红包记录列表
|
||||
*/
|
||||
@GET("/api/public/?service=Live.redPacketRecord")
|
||||
Observable<ResponseModel<List<RedPacketListBean>>> getRedPacketList();
|
||||
|
||||
/**
|
||||
* 获取红包詳情
|
||||
*/
|
||||
@GET("/api/public/?service=Live.redPacketRecordDetails")
|
||||
Observable<ResponseModel<RedPacketDetailsBean>> getRedPacketDetails(@Query("red_packet_id") int id);
|
||||
|
||||
/**
|
||||
* 获取直播间上下滑动红包集合
|
||||
*/
|
||||
@GET("/api/public/?service=Home.getRedPacket")
|
||||
Observable<ResponseModel<List<AnchorRecommendItemModel>>> getRedPacket();
|
||||
|
||||
}
|
||||
|
||||
@@ -34,6 +34,8 @@ import com.yunbao.common.bean.PrankGiftBean;
|
||||
import com.yunbao.common.bean.PrankHttpTurntableBean;
|
||||
import com.yunbao.common.bean.RandomPkUserBean;
|
||||
import com.yunbao.common.bean.RankPkInfoBean;
|
||||
import com.yunbao.common.bean.RedPacketDetailsBean;
|
||||
import com.yunbao.common.bean.RedPacketListBean;
|
||||
import com.yunbao.common.bean.SetAttentsModel;
|
||||
import com.yunbao.common.bean.StarChallengeStatusModel;
|
||||
import com.yunbao.common.bean.UserAreaBean;
|
||||
@@ -1550,7 +1552,54 @@ public class LiveNetManager {
|
||||
}
|
||||
}).isDisposed();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取红包记录列表
|
||||
*/
|
||||
public void getRedPacketList(HttpCallback<List<RedPacketListBean>> callback) {
|
||||
API.get().pdLiveApi(mContext)
|
||||
.getRedPacketList()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Consumer<ResponseModel<List<RedPacketListBean>>>() {
|
||||
@Override
|
||||
public void accept(ResponseModel<List<RedPacketListBean>> listResponseModel) throws Exception {
|
||||
if (callback != null) {
|
||||
callback.onSuccess(listResponseModel.getData().getInfo());
|
||||
}
|
||||
}
|
||||
}, new Consumer<Throwable>() {
|
||||
@Override
|
||||
public void accept(Throwable throwable) throws Exception {
|
||||
if (callback != null) {
|
||||
callback.onError(mContext.getString(R.string.net_error));
|
||||
}
|
||||
}
|
||||
}).isDisposed();
|
||||
}
|
||||
/**
|
||||
* 获取红包记录列表
|
||||
*/
|
||||
public void getRedPacketUserList(int id,HttpCallback<RedPacketDetailsBean> callback) {
|
||||
API.get().pdLiveApi(mContext)
|
||||
.getRedPacketDetails(id)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(new Consumer<ResponseModel<RedPacketDetailsBean>>() {
|
||||
@Override
|
||||
public void accept(ResponseModel<RedPacketDetailsBean> listResponseModel) throws Exception {
|
||||
if (callback != null) {
|
||||
callback.onSuccess(listResponseModel.getData().getInfo());
|
||||
}
|
||||
}
|
||||
}, new Consumer<Throwable>() {
|
||||
@Override
|
||||
public void accept(Throwable throwable) throws Exception {
|
||||
if (callback != null) {
|
||||
callback.onError(mContext.getString(R.string.net_error));
|
||||
}
|
||||
}
|
||||
}).isDisposed();
|
||||
}
|
||||
/**
|
||||
* 直播间取消网络请求
|
||||
*/
|
||||
|
||||
@@ -2,8 +2,8 @@ package com.yunbao.common.http.main;
|
||||
|
||||
import android.app.Activity;
|
||||
|
||||
import com.yunbao.common.bean.AnchorRecommendItemModel;
|
||||
import com.yunbao.common.bean.AnchorRecommendModel;
|
||||
import com.yunbao.common.bean.BaseModel;
|
||||
import com.yunbao.common.bean.FaceBookUpModel;
|
||||
import com.yunbao.common.bean.IMLoginModel;
|
||||
import com.yunbao.common.bean.MsgSwitchDetailModel;
|
||||
@@ -13,7 +13,6 @@ import com.yunbao.common.http.API;
|
||||
import com.yunbao.common.http.ResponseData;
|
||||
import com.yunbao.common.http.ResponseModel;
|
||||
import com.yunbao.common.http.base.HttpCallback;
|
||||
import com.yunbao.common.utils.ToastUtil;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -207,13 +206,14 @@ public class MainNetManager {
|
||||
|
||||
/**
|
||||
* 获取推送关注的设置和关注列表
|
||||
*
|
||||
* @param callback
|
||||
*/
|
||||
public void getMsgSwitchDetail(HttpCallback<MsgSwitchDetailModel> callback) {
|
||||
API.get().pdLiveApi(mContext).getMsgSwitchDetail()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(msgSwitchDetailModelResponseModel -> {
|
||||
.subscribe(msgSwitchDetailModelResponseModel -> {
|
||||
if (callback != null) {
|
||||
MsgSwitchDetailModel msgSwitchDetailModel = msgSwitchDetailModelResponseModel.getData().getInfo();
|
||||
callback.onSuccess(msgSwitchDetailModel);
|
||||
@@ -227,13 +227,14 @@ public class MainNetManager {
|
||||
|
||||
/**
|
||||
* 推送开关设置
|
||||
*
|
||||
* @param callback
|
||||
*/
|
||||
public void setMsgMasterSwitch(String status,String type,HttpCallback<ResponseData> callback) {
|
||||
API.get().pdLiveApi(mContext).setMsgMasterSwitch(status,type)
|
||||
public void setMsgMasterSwitch(String status, String type, HttpCallback<ResponseData> callback) {
|
||||
API.get().pdLiveApi(mContext).setMsgMasterSwitch(status, type)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(BaseModel -> {
|
||||
.subscribe(BaseModel -> {
|
||||
if (callback != null) {
|
||||
ResponseData responseData = BaseModel.getData();
|
||||
callback.onSuccess(responseData);
|
||||
@@ -247,13 +248,14 @@ public class MainNetManager {
|
||||
|
||||
/**
|
||||
* 主播开播推送开关设置
|
||||
*
|
||||
* @param callback
|
||||
*/
|
||||
public void setBeginShowMsgSwitch(String status,String isAll,String liveuid,HttpCallback<ResponseData> callback) {
|
||||
API.get().pdLiveApi(mContext).setBeginShowMsgSwitch(status,isAll,liveuid)
|
||||
public void setBeginShowMsgSwitch(String status, String isAll, String liveuid, HttpCallback<ResponseData> callback) {
|
||||
API.get().pdLiveApi(mContext).setBeginShowMsgSwitch(status, isAll, liveuid)
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(BaseModel -> {
|
||||
.subscribe(BaseModel -> {
|
||||
if (callback != null) {
|
||||
ResponseData responseData = BaseModel.getData();
|
||||
callback.onSuccess(responseData);
|
||||
@@ -264,5 +266,22 @@ public class MainNetManager {
|
||||
}
|
||||
}).isDisposed();
|
||||
}
|
||||
/**
|
||||
* 获取直播间上下滑动红包集合
|
||||
*/
|
||||
public void getRedPacket(HttpCallback<List<AnchorRecommendItemModel>> callback) {
|
||||
API.get().pdLiveApi(mContext).getRedPacket()
|
||||
.subscribeOn(Schedulers.io())
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(msgSwitchDetailModelResponseModel -> {
|
||||
if (callback != null) {
|
||||
callback.onSuccess(msgSwitchDetailModelResponseModel.getData().getInfo());
|
||||
}
|
||||
}, throwable -> {
|
||||
if (callback != null) {
|
||||
callback.onError(throwable.getMessage());
|
||||
}
|
||||
|
||||
}).isDisposed();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import com.yunbao.common.CommonAppContext;
|
||||
import com.yunbao.common.Constants;
|
||||
import com.yunbao.common.HtmlConfig;
|
||||
import com.yunbao.common.bean.LiveBean;
|
||||
import com.yunbao.common.bean.RedPacketListBean;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
|
||||
import java.util.Locale;
|
||||
@@ -39,6 +40,9 @@ public class RouteUtil {
|
||||
public static final String PATH_MYWEBVIEWACTIVTITY2 = "/main/MyWebViewActivity2";
|
||||
public static final String PATH_LOGIN = "/main/LoginActivity";
|
||||
public static final String PATH_CS = "/main/CustomerServiceWebViewActivity";
|
||||
public static final String PATH_RED_PACKET_LIST = "/main/RedPacketListActivity";
|
||||
public static final String PATH_RED_PACKET_INFO = "/main/RedPacketInfoActivity";
|
||||
public static final String PATH_RED_PACKET_USER = "/main/RedPacketUsersActivity";
|
||||
|
||||
public static void forwardFansActivity(String uid) {
|
||||
ARouter.getInstance().build(PATH_FANSACTIVITY)
|
||||
@@ -80,6 +84,7 @@ public class RouteUtil {
|
||||
.withBoolean("forwardEntry", true)
|
||||
.navigation();
|
||||
}
|
||||
|
||||
/**
|
||||
* 只回到登录页,不提示东西
|
||||
*/
|
||||
@@ -188,6 +193,7 @@ public class RouteUtil {
|
||||
ARouter.getInstance().build(PATH_EDITPROFILE)
|
||||
.navigation();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改个人资料
|
||||
*/
|
||||
@@ -256,9 +262,36 @@ public class RouteUtil {
|
||||
/**
|
||||
* 客服页面
|
||||
*/
|
||||
public static void forwardCustomerService(String url){
|
||||
public static void forwardCustomerService(String url) {
|
||||
ARouter.getInstance().build(PATH_CS)
|
||||
.withString(Constants.URL,url)
|
||||
.withString(Constants.URL, url)
|
||||
.navigation();
|
||||
}
|
||||
|
||||
/**
|
||||
* 红包记录列表
|
||||
*/
|
||||
public static void forwardRedPacketList() {
|
||||
ARouter.getInstance().build(PATH_RED_PACKET_LIST)
|
||||
.navigation();
|
||||
}
|
||||
|
||||
/**
|
||||
* 红包详情
|
||||
*/
|
||||
public static void forwardRedPacketInfo(RedPacketListBean bean) {
|
||||
ARouter.getInstance().build(PATH_RED_PACKET_INFO)
|
||||
.withSerializable("bean", bean)
|
||||
.navigation();
|
||||
}
|
||||
|
||||
/**
|
||||
* 红包发放情况
|
||||
* @param id 发放者uid
|
||||
*/
|
||||
public static void forwardRedPacketUser(int id) {
|
||||
ARouter.getInstance().build(PATH_RED_PACKET_USER)
|
||||
.withInt("id", id)
|
||||
.navigation();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:layout_marginStart="21dp"
|
||||
android:layout_marginTop="10dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
@@ -27,7 +26,7 @@
|
||||
app:layout_constraintEnd_toStartOf="@+id/money"
|
||||
android:layout_marginEnd="2dp"
|
||||
app:layout_constraintTop_toTopOf="@+id/money"
|
||||
app:srcCompat="@mipmap/diamond" />
|
||||
app:srcCompat="@mipmap/gold_coin" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout"
|
||||
@@ -62,7 +61,6 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginEnd="26dp"
|
||||
android:text="TextView"
|
||||
android:textColor="#000000"
|
||||
android:textSize="14sp"
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="72dp"
|
||||
android:background="@color/white"
|
||||
@@ -44,13 +46,25 @@
|
||||
android:id="@+id/rView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_toLeftOf="@+id/redPacketMain"
|
||||
android:layout_marginRight="10dp"
|
||||
android:gravity="center"
|
||||
android:textColor="@color/textColor"
|
||||
android:textSize="13sp"
|
||||
android:layout_marginRight="25dp"
|
||||
android:textStyle="bold"
|
||||
android:text="@string/not_received"
|
||||
android:visibility="gone"
|
||||
android:textStyle="bold" />
|
||||
tools:visibility="visible" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/redPacketMain"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginRight="15dp"
|
||||
android:visibility="invisible"
|
||||
app:srcCompat="@mipmap/ic_red_packet_record"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</RelativeLayout>
|
||||
</FrameLayout>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:onClick="backClick"
|
||||
android:padding="9dp"
|
||||
android:src="@mipmap/icon_dialog_charge_close"
|
||||
android:src="@mipmap/icon_back"
|
||||
android:tint="@color/textColor" />
|
||||
|
||||
<ImageView
|
||||
|
||||
BIN
common/src/main/res/mipmap-mdpi/ic_red_packet_record.png
Normal file
BIN
common/src/main/res/mipmap-mdpi/ic_red_packet_record.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 746 B |
BIN
common/src/main/res/mipmap-xxhdpi/bg_float_red_packet.png
Normal file
BIN
common/src/main/res/mipmap-xxhdpi/bg_float_red_packet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
@@ -1196,4 +1196,20 @@ Limited ride And limited avatar frame</string>
|
||||
<string name="rebot_config_auto_say_max">Over the maximum value</string>
|
||||
<string name="insufficient_balance">Insufficient balance, continue to recharge</string>
|
||||
<string name="live_setting_gap_3">Time limit gag</string>
|
||||
<string name="red_packet_list_title">Red packet record</string>
|
||||
<string name="red_packet_list_tips">Last 30 days record (as of yesterday)</string>
|
||||
<string name="red_packet_info_status">Current status</string>
|
||||
<string name="red_packet_info_status_success">Red packet Took effect</string>
|
||||
<string name="red_packet_info_status_timeout">Red packet Expired</string>
|
||||
<string name="red_packet_info_details">Red Packet Details</string>
|
||||
<string name="red_packet_info_details_check">Check</string>
|
||||
<string name="red_packet_info_pay_time">Pay Time</string>
|
||||
<string name="red_packet_info_mode">Mode of Pay</string>
|
||||
<string name="red_packet_info_mode_diamond">diamond</string>
|
||||
<string name="red_packet_user_tips">opened</string>
|
||||
<string name="red_packet_info_residue">Residual return</string>
|
||||
<string name="red_packet_info_residue_none">None</string>
|
||||
<string name="red_packet_info_residue_back">Return to account</string>
|
||||
<string name="red_packet_user_tips2">Popularity Red packet</string>
|
||||
<string name="main_tabs_red_packet">Red packets</string>
|
||||
</resources>
|
||||
|
||||
@@ -1191,4 +1191,20 @@
|
||||
<string name="rebot_config_auto_say_max">超过最大值</string>
|
||||
<string name="insufficient_balance">餘額不足,繼續充值</string>
|
||||
<string name="live_setting_gap_3">期限禁言</string>
|
||||
<string name="red_packet_list_title">紅包記錄</string>
|
||||
<string name="red_packet_list_tips">近30天記錄(截至到昨天)</string>
|
||||
<string name="red_packet_info_status">當前狀態</string>
|
||||
<string name="red_packet_info_status_success">紅包已生效</string>
|
||||
<string name="red_packet_info_status_timeout">紅包已過期</string>
|
||||
<string name="red_packet_info_details">紅包詳情</string>
|
||||
<string name="red_packet_info_details_check">查看</string>
|
||||
<string name="red_packet_info_pay_time">支付時間</string>
|
||||
<string name="red_packet_info_mode">支付方式</string>
|
||||
<string name="red_packet_info_mode_diamond">鉆石餘額</string>
|
||||
<string name="red_packet_user_tips">已打開</string>
|
||||
<string name="red_packet_info_residue">剩餘退回</string>
|
||||
<string name="red_packet_info_residue_none">無</string>
|
||||
<string name="red_packet_info_residue_back">退回賬戶</string>
|
||||
<string name="red_packet_user_tips2">攢人氣紅包</string>
|
||||
<string name="main_tabs_red_packet">紅包專區</string>
|
||||
</resources>
|
||||
|
||||
@@ -1190,4 +1190,20 @@
|
||||
<string name="rebot_config_auto_say_max">超过最大值</string>
|
||||
<string name="insufficient_balance">餘額不足,繼續充值</string>
|
||||
<string name="live_setting_gap_3">期限禁言</string>
|
||||
<string name="red_packet_list_title">紅包記錄</string>
|
||||
<string name="red_packet_list_tips">近30天記錄(截至到昨天)</string>
|
||||
<string name="red_packet_info_status">當前狀態</string>
|
||||
<string name="red_packet_info_status_success">紅包已生效</string>
|
||||
<string name="red_packet_info_status_timeout">紅包已過期</string>
|
||||
<string name="red_packet_info_details">紅包詳情</string>
|
||||
<string name="red_packet_info_details_check">查看</string>
|
||||
<string name="red_packet_info_pay_time">支付時間</string>
|
||||
<string name="red_packet_info_mode">支付方式</string>
|
||||
<string name="red_packet_info_mode_diamond">鉆石餘額</string>
|
||||
<string name="red_packet_user_tips">已打開</string>
|
||||
<string name="red_packet_info_residue">剩餘退回</string>
|
||||
<string name="red_packet_info_residue_none">無</string>
|
||||
<string name="red_packet_info_residue_back">退回賬戶</string>
|
||||
<string name="red_packet_user_tips2">攢人氣紅包</string>
|
||||
<string name="main_tabs_red_packet">紅包專區</string>
|
||||
</resources>
|
||||
|
||||
@@ -1191,4 +1191,20 @@
|
||||
<string name="rebot_config_auto_say_max">超过最大值</string>
|
||||
<string name="insufficient_balance">餘額不足,繼續充值</string>
|
||||
<string name="live_setting_gap_3">期限禁言</string>
|
||||
<string name="red_packet_list_title">紅包記錄</string>
|
||||
<string name="red_packet_list_tips">近30天記錄(截至到昨天)</string>
|
||||
<string name="red_packet_info_status">當前狀態</string>
|
||||
<string name="red_packet_info_status_success">紅包已生效</string>
|
||||
<string name="red_packet_info_status_timeout">紅包已過期</string>
|
||||
<string name="red_packet_info_details">紅包詳情</string>
|
||||
<string name="red_packet_info_details_check">查看</string>
|
||||
<string name="red_packet_info_pay_time">支付時間</string>
|
||||
<string name="red_packet_info_mode">支付方式</string>
|
||||
<string name="red_packet_info_mode_diamond">鉆石餘額</string>
|
||||
<string name="red_packet_user_tips">已打開</string>
|
||||
<string name="red_packet_info_residue">剩餘退回</string>
|
||||
<string name="red_packet_info_residue_none">無</string>
|
||||
<string name="red_packet_info_residue_back">退回賬戶</string>
|
||||
<string name="red_packet_user_tips2">攢人氣紅包</string>
|
||||
<string name="main_tabs_red_packet">紅包專區</string>
|
||||
</resources>
|
||||
|
||||
@@ -1197,4 +1197,20 @@ Limited ride And limited avatar frame</string>
|
||||
<string name="rebot_config_auto_say_max">Over the maximum value</string>
|
||||
<string name="insufficient_balance">Insufficient balance, continue to recharge</string>
|
||||
<string name="live_setting_gap_3">Time limit gag</string>
|
||||
<string name="red_packet_list_title">Red packet record</string>
|
||||
<string name="red_packet_list_tips">Last 30 days record (as of yesterday)</string>
|
||||
<string name="red_packet_info_status">Current status</string>
|
||||
<string name="red_packet_info_status_success">Red packet Took effect</string>
|
||||
<string name="red_packet_info_status_timeout">Red packet Expired</string>
|
||||
<string name="red_packet_info_details">Red Packet Details</string>
|
||||
<string name="red_packet_info_details_check">Check</string>
|
||||
<string name="red_packet_info_pay_time">Pay Time</string>
|
||||
<string name="red_packet_info_mode">Mode of Pay</string>
|
||||
<string name="red_packet_info_mode_diamond">diamond</string>
|
||||
<string name="red_packet_user_tips">opened</string>
|
||||
<string name="red_packet_info_residue">Residual return</string>
|
||||
<string name="red_packet_info_residue_none">None</string>
|
||||
<string name="red_packet_info_residue_back">Return to account</string>
|
||||
<string name="red_packet_user_tips2">Popularity Red packet</string>
|
||||
<string name="main_tabs_red_packet">Red packets</string>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user