yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]音萌1.3.0功能

Browse Source
This commit is contained in:
wushaocheng
2023-09-01 14:40:37 +08:00
parent 2cfc74fa85
commit f7d62e6aa0
91 changed files with 2468 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/diff_src_erban/java/com/nnbc123/core/helper/ImHelperUtils.java
View File

@@ -41,6 +41,7 @@ import com.nnbc123.core.im.custom.bean.CarAttachment;
import com.nnbc123.core.im.custom.bean.CarveUpGoldThirdLevelAttachment;
import com.nnbc123.core.im.custom.bean.ChatHintAttachment;
import com.nnbc123.core.im.custom.bean.CustomAttachment;
import com.nnbc123.core.im.custom.bean.GameInviteAttachment;
import com.nnbc123.core.im.custom.bean.ImTipAttachment;
import com.nnbc123.core.im.custom.bean.LuckyMoneyTipsAttachment;
import com.nnbc123.core.im.custom.bean.MatchAttachment;
@@ -200,6 +201,14 @@ public class ImHelperUtils {
} else if (customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_SIGN_IN
&& customAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_JUMP_SIGN_IN_ACTIVITY) {
return "[签到提醒]";
} else if (customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_GAME_INVITE
&& customAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_GAME_INVITE_SECOND) {
GameInviteAttachment gameInviteAttachment = (GameInviteAttachment) customAttachment;
if (AuthModel.get().getCurrentUid() != gameInviteAttachment.getFromUid()) {
return "你收到一条开黑邀请";
} else {
return "你发送一条开黑邀请";
}
} else if (customAttachment instanceof CarveUpGoldThirdLevelAttachment) {
return "[签到瓜分百万]";
} else if (customAttachment instanceof SysMsgVoiceAttachment) {

35
core/src/diff_src_erban/java/com/nnbc123/core/home/bean/OrderRecordBean.kt
View File

@@ -1,27 +1,28 @@
package com.nnbc123.core.home.bean
import com.nnbc123.core.user.bean.UserGameTagInfo
import java.io.Serializable
data class OrderRecordBean(
val amount: Int = 0,
val fromAvatar: String = "",
val amount: Double = 0.0,
var fromAvatar: String = "",
val fromErBanNo: Int = 0,
val fromNick: String = "",
val fromUid: Int = 0,
val gameId: Int = 0,
val gameLogo: String = "",
val gameName: String = "",
var fromNick: String = "",
var fromUid: Int = 0,
var gameId: Int = 0,
var gameLogo: String = "",
var gameName: String = "",
val id: Int = 0,
val income: Int = 0,
val inning: Int = 0,
val orderNo: String = "",
val orderTime: String = "",
val price: Int = 0,
val income: Double = 0.0,
var inning: Int = 0,
var orderNo: String = "",
var orderTime: String = "",
var price: Int = 0,
val status: Int = 0,
val statusName: String = "",
val toAvatar: String = "",
var toAvatar: String = "",
val toErBanNo: Int = 0,
val toNick: String = "",
val toUid: Int = 0,
val tags: List<UserGameTagInfo>
)
var toNick: String = "",
var toUid: Int = 0,
val tags: List<UserGameTagInfo>? = null
) : Serializable

12
core/src/diff_src_erban/java/com/nnbc123/core/manager/IMNetEaseManager.java
View File

@@ -1,7 +1,7 @@
package com.nnbc123.core.manager;
import static com.nnbc123.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.*;
import static com.nnbc123.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION;
import android.annotation.SuppressLint;
import android.graphics.BitmapFactory;
@@ -23,8 +23,6 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.hjq.toast.ToastUtils;
import com.nnbc123.core.im.custom.bean.WishListAttachment;
import com.nnbc123.core.room.anotherroompk.ShowPkMatchEvent;
import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
import com.netease.nim.uikit.common.antispam.AntiSpamEvent;
import com.netease.nim.uikit.common.util.AntiSpamUtil;
@@ -60,8 +58,6 @@ import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.nimlib.sdk.msg.model.NIMAntiSpamOption;
import com.netease.nimlib.sdk.util.Entry;
import com.netease.nimlib.sdk.util.api.RequestResult;
import com.orhanobut.logger.Logger;
import com.nnbc123.xchat_android_constants.XChatConstants;
import com.nnbc123.core.BuildConfig;
import com.nnbc123.core.Constants;
import com.nnbc123.core.R;
@@ -74,9 +70,11 @@ import com.nnbc123.core.decoration.headwear.bean.HeadWearInfo;
import com.nnbc123.core.exception.ErrorThrowable;
import com.nnbc123.core.family.bean.FamilyInfo;
import com.nnbc123.core.family.event.FamilyMineEvent;
import com.nnbc123.core.game.event.GameInviteEvent;
import com.nnbc123.core.gift.GiftModel;
import com.nnbc123.core.gift.bean.GiftInfo;
import com.nnbc123.core.helper.AtProxy;
import com.nnbc123.core.home.bean.OrderRecordBean;
import com.nnbc123.core.im.custom.bean.ActivityTimerAttachment;
import com.nnbc123.core.im.custom.bean.AssistantAttachment;
import com.nnbc123.core.im.custom.bean.CarAttachment;
@@ -110,6 +108,7 @@ import com.nnbc123.core.im.custom.bean.RoomTipAttachment;
import com.nnbc123.core.im.custom.bean.RouterType;
import com.nnbc123.core.im.custom.bean.SysMsgAttachment;
import com.nnbc123.core.im.custom.bean.WelcomeAttachment;
import com.nnbc123.core.im.custom.bean.WishListAttachment;
import com.nnbc123.core.level.UserLevelVo;
import com.nnbc123.core.luckymoney.LuckyMoneyInfo;
import com.nnbc123.core.magic.MagicModel;
@@ -132,6 +131,7 @@ import com.nnbc123.core.retry.ReconnectListener;
import com.nnbc123.core.retry.RetryChatRoomMessage;
import com.nnbc123.core.room.activitytimer.ActivityTimerEvent;
import com.nnbc123.core.room.activitytimer.TimerBean;
import com.nnbc123.core.room.anotherroompk.ShowPkMatchEvent;
import com.nnbc123.core.room.auction.bean.AuctionInfo;
import com.nnbc123.core.room.bean.LeaveModeAttachment;
import com.nnbc123.core.room.bean.RoomInfo;
@@ -181,6 +181,8 @@ import com.nnbc123.library.utils.NetworkUtils;
import com.nnbc123.library.utils.SingleToastUtil;
import com.nnbc123.library.utils.config.BasicConfig;
import com.nnbc123.library.utils.log.MLog;
import com.nnbc123.xchat_android_constants.XChatConstants;
import com.orhanobut.logger.Logger;
import org.greenrobot.eventbus.EventBus;
import org.reactivestreams.Publisher;

20
core/src/main/java/com/nnbc123/core/event/RoomInviteEvent.java Normal file
View File

@@ -0,0 +1,20 @@
package com.nnbc123.core.event;
import com.nnbc123.core.home.bean.OrderRecordBean;
public class RoomInviteEvent {
private OrderRecordBean orderRecordBean;
public RoomInviteEvent(OrderRecordBean orderRecordBean) {
this.orderRecordBean = orderRecordBean;
}
public OrderRecordBean getOrderRecordBean() {
return orderRecordBean;
}
public void setOrderRecordBean(OrderRecordBean orderRecordBean) {
this.orderRecordBean = orderRecordBean;
}
}

20
core/src/main/java/com/nnbc123/core/game/event/GameInviteEvent.java Normal file
View File

@@ -0,0 +1,20 @@
package com.nnbc123.core.game.event;
import com.nnbc123.core.home.bean.OrderRecordBean;
public class GameInviteEvent {
private OrderRecordBean orderRecordBean;
//<editor-fold defaultstate="collapsed" desc="delombok">
@SuppressWarnings("all")
public GameInviteEvent() {
}
public OrderRecordBean getOrderRecordBean() {
return orderRecordBean;
}
public void setOrderRecordBean(OrderRecordBean orderRecordBean) {
this.orderRecordBean = orderRecordBean;
}
}

7
core/src/main/java/com/nnbc123/core/im/custom/bean/CustomAttachParser.java
View File

@@ -17,6 +17,8 @@ import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GAME_INVITE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GAME_INVITE_SECOND;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC;
@@ -609,6 +611,11 @@ public class CustomAttachParser implements MsgAttachmentParser {
case CUSTOM_MSG_PRIVILEGE:
attachment = new RoomPrivilegeAttachment(first, second);
break;
case CUSTOM_MSG_GAME_INVITE:
if (second == CUSTOM_MSG_GAME_INVITE_SECOND) {
attachment = new GameInviteAttachment(first, second);
}
break;
default:
LogUtils.e("未定义的first,请现在CustomAttachParser中解析first=" + first + " second=" + second);
break;

3
core/src/main/java/com/nnbc123/core/im/custom/bean/CustomAttachment.java
View File

@@ -437,6 +437,9 @@ public class CustomAttachment implements MsgAttachment {
public static final int CUSTOM_MSG_PRIVILEGE = 102; //特权卡
public static final int CUSTOM_MSG_PRIVILEGE_SECOND = 1020;//特权卡
public static final int CUSTOM_MSG_GAME_INVITE = 103;//发起邀请
public static final int CUSTOM_MSG_GAME_INVITE_SECOND = 1030;//发起邀请(发起用户)
/**
* 自定义消息附件的类型，根据该字段区分不同的自定义消息
*/

173
core/src/main/java/com/nnbc123/core/im/custom/bean/GameInviteAttachment.java Normal file
View File

@@ -0,0 +1,173 @@
package com.nnbc123.core.im.custom.bean;
import com.alibaba.fastjson.JSONObject;
/**
* Created by chenran on 2017/10/4.
*/
public class GameInviteAttachment extends CustomAttachment {
private String gameLogo;//游戏logo
private String gameName;//游戏名称
private int inning;//局数
private String fromAvatar;
private String fromNick;
private String toAvatar;
private String toNick;
private String orderNo;
private String orderTime;
private int price;
private int gameId;
private int fromUid;
private int toUid;
public GameInviteAttachment(int first, int second) {
super(first, second);
}
public String getGameLogo() {
return gameLogo;
}
public void setGameLogo(String gameLogo) {
this.gameLogo = gameLogo;
}
public String getGameName() {
return gameName;
}
public void setGameName(String gameName) {
this.gameName = gameName;
}
public int getInning() {
return inning;
}
public void setInning(int inning) {
this.inning = inning;
}
public String getFromAvatar() {
return fromAvatar;
}
public void setFromAvatar(String fromAvatar) {
this.fromAvatar = fromAvatar;
}
public String getFromNick() {
return fromNick;
}
public void setFromNick(String fromNick) {
this.fromNick = fromNick;
}
public String getToAvatar() {
return toAvatar;
}
public void setToAvatar(String toAvatar) {
this.toAvatar = toAvatar;
}
public String getToNick() {
return toNick;
}
public void setToNick(String toNick) {
this.toNick = toNick;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getOrderTime() {
return orderTime;
}
public void setOrderTime(String orderTime) {
this.orderTime = orderTime;
}
public int getPrice() {
return price;
}
public void setPrice(int price) {
this.price = price;
}
public int getGameId() {
return gameId;
}
public void setGameId(int gameId) {
this.gameId = gameId;
}
public int getFromUid() {
return fromUid;
}
public void setFromUid(int fromUid) {
this.fromUid = fromUid;
}
public int getToUid() {
return toUid;
}
public void setToUid(int toUid) {
this.toUid = toUid;
}
@Override
protected void parseData(JSONObject jsonObject) {
gameLogo = jsonObject.getString("gameLogo");
gameName = jsonObject.getString("gameName");
inning = jsonObject.getInteger("inning");
fromAvatar = jsonObject.getString("fromAvatar");
fromNick = jsonObject.getString("fromNick");
toAvatar = jsonObject.getString("toAvatar");
toNick = jsonObject.getString("toNick");
orderNo = jsonObject.getString("orderNo");
orderTime = jsonObject.getString("orderTime");
price = jsonObject.getInteger("price");
gameId = jsonObject.getInteger("gameId");
fromUid = jsonObject.getInteger("fromUid");
toUid = jsonObject.getInteger("toUid");
}
@Override
protected JSONObject packData() {
return null;
}
@Override
public String toString() {
return "GameInviteAttachment{" +
", gameLogo=" + gameLogo +
", gameName=" + gameName +
", inning=" + inning +
", fromAvatar=" + fromAvatar +
", fromNick=" + fromNick +
", toAvatar=" + toAvatar +
", toNick=" + toNick +
", orderNo=" + orderNo +
", orderTime=" + orderTime +
", price=" + price +
", gameId=" + gameId +
", fromUid=" + fromUid +
", toUid=" + toUid +
'}';
}
}

39
core/src/main/java/com/nnbc123/core/manager/IMMessageManager.java
View File

@@ -1,5 +1,16 @@
package com.nnbc123.core.manager;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GAME_INVITE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER;
import android.util.Log;
import com.netease.nimlib.sdk.InvocationFuture;
@@ -18,8 +29,11 @@ import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.nnbc123.core.activity.event.ActivityEvent;
import com.nnbc123.core.auth.AuthModel;
import com.nnbc123.core.event.RoomInviteEvent;
import com.nnbc123.core.home.bean.OrderRecordBean;
import com.nnbc123.core.im.custom.bean.CpInviteAttachment;
import com.nnbc123.core.im.custom.bean.CustomAttachment;
import com.nnbc123.core.im.custom.bean.GameInviteAttachment;
import com.nnbc123.core.im.custom.bean.LevelUpAttachment;
import com.nnbc123.core.im.custom.bean.LotteryAttachment;
import com.nnbc123.core.im.custom.bean.LuckyMoneyTipsAttachment;
@@ -42,16 +56,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER;
/**
* Created by MadisonRong on 23/07/2018.
*/
@@ -171,6 +175,21 @@ public class IMMessageManager {
CpInviteInfo cpInviteInfo = ((CpInviteAttachment) attachment).getEntity();
EventBus.getDefault().post(cpInviteInfo);
break;
case CUSTOM_MSG_GAME_INVITE:
GameInviteAttachment gameInviteAttachment = (GameInviteAttachment) msg.getAttachment();
if(gameInviteAttachment.getFromUid() == AuthModel.get().getCurrentUid()){
return;
}
OrderRecordBean orderRecordBean = new OrderRecordBean();
orderRecordBean.setFromAvatar(gameInviteAttachment.getFromAvatar());
orderRecordBean.setFromNick(gameInviteAttachment.getFromNick());
orderRecordBean.setInning(gameInviteAttachment.getInning());
orderRecordBean.setGameLogo(gameInviteAttachment.getGameLogo());
orderRecordBean.setGameName(gameInviteAttachment.getGameName());
orderRecordBean.setFromUid(gameInviteAttachment.getFromUid());
orderRecordBean.setToUid(gameInviteAttachment.getToUid());
EventBus.getDefault().post(new RoomInviteEvent(orderRecordBean));
break;
}
}
}

30
core/src/main/java/com/nnbc123/core/manager/IMSystemMsgManager.java
View File

@@ -1,5 +1,20 @@
package com.nnbc123.core.manager;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE;
import android.text.TextUtils;
import android.util.Log;
@@ -49,21 +64,6 @@ import com.nnbc123.core.vip.VipUpgradeEvent;
import org.greenrobot.eventbus.EventBus;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE;
/**
* 云信系统通知管理类
*/

10
core/src/main/java/com/nnbc123/core/user/IUserModel.java
View File

@@ -12,7 +12,9 @@ import com.nnbc123.core.user.bean.NewUserInfo;
import com.nnbc123.core.user.bean.ProtocolInfo;
import com.nnbc123.core.user.bean.UserDetailInfo;
import com.nnbc123.core.user.bean.UserExpInfo;
import com.nnbc123.core.user.bean.UserGameGangUpInfo;
import com.nnbc123.core.user.bean.UserGameInfo;
import com.nnbc123.core.user.bean.UserGamePartner;
import com.nnbc123.core.user.bean.UserInfo;
import com.nnbc123.core.user.bean.UserRandomConfig;
@@ -88,6 +90,14 @@ public interface IUserModel extends IModel {
*/
Single<UserDetailInfo> getUserInfoDetail(long userId);
/**
* 用户的游戏配置信息
*
* @param uid
* @return
*/
Single<List<UserGameGangUpInfo>> getUserGamePartnerInfo(String uid);
/**
* 咨询下单
*

11
core/src/main/java/com/nnbc123/core/user/UserModel.java
View File

@@ -26,6 +26,7 @@ import com.nnbc123.core.user.bean.NewUserInfo;
import com.nnbc123.core.user.bean.ProtocolInfo;
import com.nnbc123.core.user.bean.UserDetailInfo;
import com.nnbc123.core.user.bean.UserExpInfo;
import com.nnbc123.core.user.bean.UserGameGangUpInfo;
import com.nnbc123.core.user.bean.UserGameInfo;
import com.nnbc123.core.user.bean.UserInfo;
import com.nnbc123.core.user.bean.UserRandomConfig;
@@ -329,6 +330,13 @@ public final class UserModel extends BaseModel implements IUserModel {
});
}
@Override
public Single<List<UserGameGangUpInfo>> getUserGamePartnerInfo(String uid) {
return api.getGamePartnerInfo(String.valueOf(uid))
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers());
}
@Override
public Single<String> postConsultingOrder(String uid, String gameId, String gameUid) {
return api.postConsultingOrder(String.valueOf(uid), gameId, gameUid)
@@ -862,6 +870,9 @@ public final class UserModel extends BaseModel implements IUserModel {
@GET("/user/detail/get")
Single<UserDetailInfo> getUserInfoDetail(@Query("uid") String uid);
@GET("/gamePartnerInfo/list")
Single<ServiceResult<List<UserGameGangUpInfo>>> getGamePartnerInfo(@Query("uid") String uid);
@GET("/gamePartnerOrder/consult")
Single<ServiceResult<String>> postConsultingOrder(@Query("uid") String uid, @Query("gameId") String gameId, @Query("gameUid") String gameUid);

9
core/src/main/java/com/nnbc123/core/user/bean/UserGameGangUpInfo.kt
View File

@@ -3,13 +3,18 @@ package com.nnbc123.core.user.bean
import java.io.Serializable
data class UserGameGangUpInfo(
val background: String = "",
val btnBg: String = "",
val btnRgb: String = "#683F0B",
val tagBg: String = "#FFF8ED",
val tagRgb: String = "#643400",
val finishNum: Int = 0,
val gameId: Int = 0,
val gameName: String = "",
val logo:String = "",
val price:Int = 0,
val seq: Int = 0,
val uid: Int = 0,
val tags: List<UserGameTagInfo>,
val uid: Long = 0L,
val tags: List<UserGameTagInfo> ?= null,
var isSelect: Boolean = false
) : Serializable

17
core/src/main/java/com/nnbc123/core/user/bean/UserGamePartner.kt Normal file
View File

@@ -0,0 +1,17 @@
package com.nnbc123.core.user.bean
data class UserGamePartner(
val background: String = "",
val btnBg: String = "",
val btnRgb: String = "#683F0B",
val finishNum:Int = 0,
val gameId:Int = 0,
val gameName: String = "",
val logo: String = "",
val price: Int = 0,
val seq: Int = 0,
val tagBg: String = "#FFF8ED",
val tagRgb: String = "#643400",
val uid: Int = 0,
val tags: List<UserGameTagInfo> ?= null
)

15
core/src/model_labour_union/java/com/nnbc123/core/module_hall/income/bean/HallIncomeInfo.java
View File

@@ -10,6 +10,7 @@ public class HallIncomeInfo implements Serializable {
private double normalGiftIncome;
private String giftUv;
private String newUserSendGiftNum;
private double gameOrderAmount;
//<editor-fold defaultstate="collapsed" desc="delombok">
@SuppressWarnings("all")
@@ -86,6 +87,14 @@ public class HallIncomeInfo implements Serializable {
this.newUserSendGiftNum = newUserSendGiftNum;
}
public double getGameOrderAmount() {
return gameOrderAmount;
}
public void setGameOrderAmount(double gameOrderAmount) {
this.gameOrderAmount = gameOrderAmount;
}
@Override
@SuppressWarnings("all")
public boolean equals(final Object o) {
@@ -141,7 +150,11 @@ public class HallIncomeInfo implements Serializable {
@Override
@SuppressWarnings("all")
public String toString() {
return "ClanIncomeInfo(bagIncome=" + this.getBagIncome() + ", hallAvatar=" + this.getHallAvatar() + ", hallName=" + this.getHallName() + ", roomIncome=" + this.getRoomIncome() + ", normalGiftIncome=" + this.getNormalGiftIncome() + ", giftUv=" + this.getGiftUv() + ", newUserSendGiftNum=" + this.getNewUserSendGiftNum() + ")";
return "ClanIncomeInfo(bagIncome=" + this.getBagIncome() + ", hallAvatar="
+ this.getHallAvatar() + ", hallName=" + this.getHallName() + ", roomIncome="
+ this.getRoomIncome() + ", normalGiftIncome=" + this.getNormalGiftIncome()
+ ", giftUv=" + this.getGiftUv() + ", gameOrderAmount=" + this.getGameOrderAmount()
+ ", newUserSendGiftNum=" + this.getNewUserSendGiftNum() + ")";
}
//</editor-fold>
}

28
core/src/model_labour_union/java/com/nnbc123/core/module_hall/income/bean/IncomeInfo.java
View File

@@ -28,6 +28,11 @@ public class IncomeInfo implements Serializable {
*/
private long erbanNo;
/**
* 点单流水
*/
private long gameOrderAmount;
//<editor-fold defaultstate="collapsed" desc="delombok">
@SuppressWarnings("all")
public IncomeInfo() {
@@ -129,6 +134,18 @@ public class IncomeInfo implements Serializable {
this.erbanNo = erbanNo;
}
/**
* 点单
*/
@SuppressWarnings("all")
public long getGameOrderAmount() {
return gameOrderAmount;
}
public void setGameOrderAmount(long gameOrderAmount) {
this.gameOrderAmount = gameOrderAmount;
}
@Override
@SuppressWarnings("all")
public boolean equals(final Object o) {
@@ -141,10 +158,12 @@ public class IncomeInfo implements Serializable {
if (this.getErbanNo() != other.getErbanNo()) return false;
final Object this$rowNum = this.getRowNum();
final Object other$rowNum = other.getRowNum();
if (this$rowNum == null ? other$rowNum != null : !this$rowNum.equals(other$rowNum)) return false;
if (this$rowNum == null ? other$rowNum != null : !this$rowNum.equals(other$rowNum))
return false;
final Object this$avatar = this.getAvatar();
final Object other$avatar = other.getAvatar();
if (this$avatar == null ? other$avatar != null : !this$avatar.equals(other$avatar)) return false;
if (this$avatar == null ? other$avatar != null : !this$avatar.equals(other$avatar))
return false;
final Object this$nick = this.getNick();
final Object other$nick = other.getNick();
if (this$nick == null ? other$nick != null : !this$nick.equals(other$nick)) return false;
@@ -179,7 +198,10 @@ public class IncomeInfo implements Serializable {
@Override
@SuppressWarnings("all")
public String toString() {
return "IncomeInfo(rowNum=" + this.getRowNum() + ", reciveUid=" + this.getReciveUid() + ", totalGoldNum=" + this.getTotalGoldNum() + ", avatar=" + this.getAvatar() + ", nick=" + this.getNick() + ", erbanNo=" + this.getErbanNo() + ")";
return "IncomeInfo(rowNum=" + this.getRowNum() + ", reciveUid=" + this.getReciveUid()
+ ", totalGoldNum=" + this.getTotalGoldNum() + ", avatar=" + this.getAvatar()
+ ", gameOrderAmount=" + this.getGameOrderAmount()
+ ", nick=" + this.getNick() + ", erbanNo=" + this.getErbanNo() + ")";
}
//</editor-fold>
}