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

[Modify]1.2.0bug修复

Browse Source
This commit is contained in:
wushaocheng
2023-08-04 12:04:53 +08:00
parent 31266aaee0
commit d05e8e9a53
70 changed files with 2357 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1425,6 +1425,12 @@ public final class IMNetEaseManager {
addMessages(msg);
}
break;
case CUSTOM_MSG_PRIVILEGE:
if (customAttachment.getSecond() == CUSTOM_MSG_PRIVILEGE_SECOND) {
noticeRoomEvent(msg, RoomEvent.ROOM_PRIVILEGE);
addMessages(msg);
}
break;
default:
break;
}

11
core/src/diff_src_erban/java/com/nnbc123/core/manager/trtc/TRtcEngineManager.java
View File

@@ -10,12 +10,14 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.orhanobut.logger.Logger;
import com.nnbc123.core.initial.InitialModel;
import com.nnbc123.core.initial.bean.InitInfo;
import com.nnbc123.core.manager.AvRoomDataManager;
import com.nnbc123.core.manager.BaseEngine;
import com.nnbc123.core.music.db.bean.LocalMusicBean;
import com.nnbc123.core.music.model.PlayerModel;
import com.nnbc123.library.utils.config.BasicConfig;
import com.orhanobut.logger.Logger;
import io.agora.rtc.Constants;
@@ -45,7 +47,12 @@ public class TRtcEngineManager extends BaseEngine {
Logger.t(TAG).d("enterChannel channelId:%d", channelId);
if (mRtcEngine == null) {
try {
mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), String.valueOf(SDKConfig.TX_SDKAPPID), mEngineEventHandler);
InitInfo initInfo = InitialModel.get().getCacheInitInfo();
if (initInfo != null && initInfo.getTrtcAppId() != null) {
mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), initInfo.getTrtcAppId(), mEngineEventHandler);
} else {
mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), String.valueOf(SDKConfig.TX_SDKAPPID), mEngineEventHandler);
}
} catch (Exception e) {
throw new RuntimeException(
"NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e));

5
core/src/diff_src_erban/java/com/nnbc123/core/privilege/bean/PrivilegeCardInfo.kt
View File

@@ -22,5 +22,8 @@ data class PrivilegeCardInfo(
val operatorId: Int = 0,
val roomUid: Int = 0,
val uidStr: String = "",
val updateTime: String = ""
val updateTime: String = "",
val sendNick: String = "",
val sendUid: Long = 0L,
val cardNum: Int = 0
) : Serializable

6
core/src/diff_src_erban/java/com/nnbc123/core/roombg/bean/RoomBgInfo.kt
View File

@@ -1,5 +1,7 @@
package com.nnbc123.core.roombg.bean
import java.io.Serializable
data class RoomBgInfo(
val erbanNoStr: String = "",
val id: Int = 0,
@@ -11,5 +13,5 @@ data class RoomBgInfo(
val roomUidStr: String = "",
val seq: Int = 0,
val type: Int = 0,
val viewUrl: String = ""
)
val viewUrl: String = "",
) : Serializable

17
core/src/diff_src_erban/java/com/nnbc123/core/roombg/model/RoomBgModel.kt
View File

@@ -3,7 +3,6 @@ package com.nnbc123.core.roombg.model
import com.nnbc123.core.base.BaseModel
import com.nnbc123.core.bean.response.ServiceResult
import com.nnbc123.core.home.bean.*
import com.nnbc123.core.privilege.bean.PrivilegeCardInfo
import com.nnbc123.core.roombg.bean.RoomBgInfo
import com.nnbc123.core.utils.net.launchRequest
import com.nnbc123.library.net.rxnet.RxNet
@@ -20,6 +19,11 @@ object RoomBgModel : BaseModel() {
api.getRoomBgList(type, roomUid)
}
suspend fun roomUse(backgroundId: String, roomUid: String): String? =
launchRequest {
api.roomUse(backgroundId, roomUid)
}
private interface Api {
/**
@@ -33,6 +37,17 @@ object RoomBgModel : BaseModel() {
@Query("roomUid") roomUid: String
): ServiceResult<List<RoomBgInfo>>
/**
* 使用房间背景
*
* @return
*/
@POST("/room/background/use")
suspend fun roomUse(
@Query("backgroundId") backgroundId: String,
@Query("roomUid") roomUid: String
): ServiceResult<String>
}
}

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

@@ -36,6 +36,7 @@ import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PRIVILEGE;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC;
import static com.nnbc123.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH;
@@ -605,6 +606,9 @@ public class CustomAttachParser implements MsgAttachmentParser {
case CUSTOM_MSG_KITCHEN:
attachment = new RoomKitchenAttachment(first, second);
break;
case CUSTOM_MSG_PRIVILEGE:
attachment = new RoomPrivilegeAttachment(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

@@ -3,6 +3,7 @@ package com.nnbc123.core.im.custom.bean;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
import com.nnbc123.core.PreferencesUtils;
import com.nnbc123.core.noble.NobleInfo;
/**
@@ -433,6 +434,8 @@ public class CustomAttachment implements MsgAttachment {
public static final int CUSTOM_MSG_SUB_KITCHEN_ALL_ROOM = 961; // 深海奇缘礼物房间飘屏通知(动态)
public static final int CUSTOM_MSG_SUB_kitchen_ALL_APP = 962; // 深海奇缘礼物全服飘屏通知
public static final int CUSTOM_MSG_PRIVILEGE = 102; //特权卡
public static final int CUSTOM_MSG_PRIVILEGE_SECOND = 1020;//特权卡
/**
* 自定义消息附件的类型，根据该字段区分不同的自定义消息

86
core/src/main/java/com/nnbc123/core/im/custom/bean/RoomPrivilegeAttachment.java Normal file
View File

@@ -0,0 +1,86 @@
package com.nnbc123.core.im.custom.bean;
import com.alibaba.fastjson.JSONObject;
/**
* Created by chenran on 2017/10/4.
*/
public class RoomPrivilegeAttachment extends CustomAttachment {
private String cardUrl;
private String cardName;
private String sendNick;
private long sendUid;
private int cardNum;
public RoomPrivilegeAttachment(int first, int second) {
super(first, second);
}
public String getCardUrl() {
return cardUrl;
}
public void setCardUrl(String cardUrl) {
this.cardUrl = cardUrl;
}
public String getCardName() {
return cardName;
}
public void setCardName(String cardName) {
this.cardName = cardName;
}
public String getSendNick() {
return sendNick;
}
public void setSendNick(String sendNick) {
this.sendNick = sendNick;
}
public long getSendUid() {
return sendUid;
}
public void setSendUid(long sendUid) {
this.sendUid = sendUid;
}
public int getCardNum() {
return cardNum;
}
public void setCardNum(int cardNum) {
this.cardNum = cardNum;
}
@Override
protected void parseData(JSONObject jsonObject) {
cardUrl = jsonObject.getString("cardUrl");
cardName = jsonObject.getString("cardName");
sendNick = jsonObject.getString("sendNick");
sendUid = jsonObject.getLong("sendUid");
cardNum = jsonObject.getInteger("cardNum");
}
@Override
protected JSONObject packData() {
return null;
}
@Override
public String toString() {
return "RoomPrivilegeAttachment{" +
"cardUrl=" + cardUrl +
", cardName='" + cardName + '\'' +
", sendNick=" + sendNick +
", sendUid=" + sendUid +
", cardNum='" + cardNum + '\'' +
'}';
}
}

20
core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java
View File

@@ -111,6 +111,10 @@ public class InitInfo implements Serializable {
*/
private int findNewbieCharmLevel;
/**
* 腾讯trtc预埋
*/
private String trtcAppId;
public class AppUpgradePackageAddress implements Serializable {
private String androidUrl;
@@ -771,6 +775,14 @@ public class InitInfo implements Serializable {
this.twelveStarSwitch = twelveStarSwitch;
}
public String getTrtcAppId() {
return trtcAppId;
}
public void setTrtcAppId(String trtcAppId) {
this.trtcAppId = trtcAppId;
}
@Override
@SuppressWarnings("all")
public boolean equals(final Object o) {
@@ -857,6 +869,9 @@ public class InitInfo implements Serializable {
final Object this$officialMsgUids = this.getOfficialMsgUids();
final Object other$officialMsgUids = other.getOfficialMsgUids();
if (this$officialMsgUids == null ? other$officialMsgUids != null : !this$officialMsgUids.equals(other$officialMsgUids)) return false;
final Object this$trtcAppId = this.getTrtcAppId();
final Object other$trtcAppId = other.getTrtcAppId();
if (this$trtcAppId == null ? other$trtcAppId != null : !this$trtcAppId.equals(other$trtcAppId)) return false;
return true;
}
@@ -937,13 +952,16 @@ public class InitInfo implements Serializable {
result = result * PRIME + ($homeTabList == null ? 43 : $homeTabList.hashCode());
final Object $officialMsgUids = this.getOfficialMsgUids();
result = result * PRIME + ($officialMsgUids == null ? 43 : $officialMsgUids.hashCode());
final Object $trtcAppId = this.getTrtcAppId();
result = result * PRIME + ($trtcAppId == null ? 43 : $trtcAppId.hashCode());
return result;
}
@Override
@SuppressWarnings("all")
public String toString() {
return "InitInfo(faceJson=" + this.getFaceJson() + ", splashVo=" + this.getSplashVo() + ", redEnvelopeConfig=" + this.getRedEnvelopeConfig() + ", rights=" + this.getRights() + ", nobleResource=" + this.getNobleResource() + ", monsters=" + this.getMonsters() + ", exchangeGoldRate=" + this.getExchangeGoldRate() + ", exchangeRate=" + this.getExchangeRate() + ", tax=" + this.getTax() + ", webHostName=" + this.getWebHostName() + ", publicChatRoomId=" + this.getPublicChatRoomId() + ", publicChatRoomUid=" + this.getPublicChatRoomUid() + ", publicChatRoomLevelNo=" + this.getPublicChatRoomLevelNo() + ", privateChatLevelNo=" + this.getPrivateChatLevelNo() + ", privateChatRegisterDay=" + this.getPrivateChatRegisterDay() + ", openBoxSwitch=" + this.isOpenBoxSwitch() + ", openBoxSwitchLevelNo=" + this.getOpenBoxSwitchLevelNo() + ", diamondBoxSwitch=" + this.isDiamondBoxSwitch() + ", defaultHomeTab=" + this.getDefaultHomeTab() + ", openBoxIcon=" + this.getOpenBoxIcon() + ", playTogether=" + this.isPlayTogether() + ", certificationType=" + this.getCertificationType() + ", dynamicRefresh=" + this.getDynamicRefresh() + ", roomRefresh=" + this.getRoomRefresh() + ", gameSwitch=" + this.isGameSwitch() + ", gameRankSwitch=" + this.isGameRankSwitch() + ", gameTime=" + this.getGameTime() + ", gameFrequency=" + this.getGameFrequency() + ", redEnvelopedPosition=" + this.getRedEnvelopedPosition() + ", redEnvelopeType=" + this.getRedEnvelopeType() + ", captchaSwitch=" + this.isCaptchaSwitch() + ", currentTime=" + this.getCurrentTime() + ", worldGroupChatLevelNo=" + this.getWorldGroupChatLevelNo() + ", reportSwitch=" + this.isReportSwitch() + ", teenagerMode=" + this.getTeenagerMode() + ", updateUrl=" + this.getUpdateUrl() + ", domainList=" + this.getDomainList() + ", roomMessageCount=" + this.getRoomMessageCount() + ", findNewbieCharmLevel=" + this.getFindNewbieCharmLevel() + ", checkUids=" + this.getCheckUids() + ", checkInviteCode=" + this.isCheckInviteCode() + ", homeTabList=" + this.getHomeTabList() + ", roomBlackListSize=" + this.getRoomBlackListSize() + ", hideCarEffectGiftPrice=" + this.getHideCarEffectGiftPrice() + ", linearlyPoolOpenLevel=" + this.getLinearlyPoolOpenLevel() + ", officialMsgUids=" + this.getOfficialMsgUids() + ", twelveStarSwitch=" + this.isTwelveStarSwitch() + ")";
return "InitInfo(faceJson=" + this.getFaceJson() + ", splashVo=" + this.getSplashVo() + ", redEnvelopeConfig=" + this.getRedEnvelopeConfig() + ", rights=" + this.getRights() + ", nobleResource=" + this.getNobleResource() + ", monsters=" + this.getMonsters() + ", exchangeGoldRate=" + this.getExchangeGoldRate() + ", exchangeRate=" + this.getExchangeRate() + ", tax=" + this.getTax() + ", webHostName=" + this.getWebHostName() + ", publicChatRoomId=" + this.getPublicChatRoomId() + ", publicChatRoomUid=" + this.getPublicChatRoomUid() + ", publicChatRoomLevelNo=" + this.getPublicChatRoomLevelNo() + ", privateChatLevelNo=" + this.getPrivateChatLevelNo() + ", privateChatRegisterDay=" + this.getPrivateChatRegisterDay() + ", openBoxSwitch=" + this.isOpenBoxSwitch() + ", openBoxSwitchLevelNo=" + this.getOpenBoxSwitchLevelNo() + ", diamondBoxSwitch=" + this.isDiamondBoxSwitch() + ", defaultHomeTab=" + this.getDefaultHomeTab() + ", openBoxIcon=" + this.getOpenBoxIcon() + ", playTogether=" + this.isPlayTogether() + ", certificationType=" + this.getCertificationType() + ", dynamicRefresh=" + this.getDynamicRefresh() + ", roomRefresh=" + this.getRoomRefresh() + ", gameSwitch=" + this.isGameSwitch() + ", gameRankSwitch=" + this.isGameRankSwitch() + ", gameTime=" + this.getGameTime() + ", gameFrequency=" + this.getGameFrequency() + ", redEnvelopedPosition=" + this.getRedEnvelopedPosition() + ", redEnvelopeType=" + this.getRedEnvelopeType() + ", captchaSwitch=" + this.isCaptchaSwitch() + ", currentTime=" + this.getCurrentTime() + ", worldGroupChatLevelNo=" + this.getWorldGroupChatLevelNo() + ", reportSwitch=" + this.isReportSwitch() + ", teenagerMode=" + this.getTeenagerMode() + ", updateUrl=" + this.getUpdateUrl() + ", domainList=" + this.getDomainList() + ", roomMessageCount=" + this.getRoomMessageCount() + ", findNewbieCharmLevel=" + this.getFindNewbieCharmLevel() + ", checkUids=" + this.getCheckUids() + ", checkInviteCode=" + this.isCheckInviteCode() + ", homeTabList=" + this.getHomeTabList() + ", roomBlackListSize=" + this.getRoomBlackListSize() + ", hideCarEffectGiftPrice=" + this.getHideCarEffectGiftPrice() + ", linearlyPoolOpenLevel=" + this.getLinearlyPoolOpenLevel() + ", officialMsgUids=" + this.getOfficialMsgUids() + ", twelveStarSwitch=" + this.isTwelveStarSwitch() + ", trtcAppId=" + this.getTrtcAppId() + ")";
}
//</editor-fold>
}

4
core/src/main/java/com/nnbc123/core/manager/AvRoomDataManager.java
View File

@@ -535,6 +535,10 @@ public final class AvRoomDataManager {
return mCurrentRoomInfo != null && mCurrentRoomInfo.getUid() == AuthModel.get().getCurrentUid();
}
public boolean isLicensed() {
return mCurrentRoomInfo != null && mCurrentRoomInfo.getIsPermitRoom() == 1;
}
void removeManagerMember(String account) {
if (ListUtils.isListEmpty(mRoomManagerList) || TextUtils.isEmpty(account)) return;
ListIterator<ChatRoomMember> iterator = mRoomManagerList.listIterator();

2
core/src/main/java/com/nnbc123/core/manager/RoomEvent.java
View File

@@ -255,6 +255,8 @@ public class RoomEvent {
public static final int KITCHEN_ALL_ROOM = 101;
public static final int ROOM_PRIVILEGE = 102;
private int event = NONE;
private int micPosition = Integer.MIN_VALUE;
private int posState = -1;

68
core/src/main/java/com/nnbc123/core/room/bean/RoomInfo.java
View File

@@ -77,6 +77,7 @@ public class RoomInfo implements Parcelable, Serializable {
private byte isRecom;
private boolean isRoomFans;
private BackgroundBean background;
private RoomBackgroundBean roomBackground;
//是否有ktv权限的意思
public boolean hasKTVPriv;
//房间是否打开了ktv
@@ -161,6 +162,7 @@ public class RoomInfo implements Parcelable, Serializable {
isRecom = in.readByte();
isRoomFans = in.readByte() != 0;
background = in.readParcelable(BackgroundBean.class.getClassLoader());
roomBackground = in.readParcelable(RoomBackgroundBean.class.getClassLoader());
hasKTVPriv = in.readByte() != 0;
isOpenKTV = in.readByte() != 0;
isOpenGame = in.readByte() != 0;
@@ -225,6 +227,7 @@ public class RoomInfo implements Parcelable, Serializable {
dest.writeByte(isRecom);
dest.writeByte((byte) (isRoomFans ? 1 : 0));
dest.writeParcelable(background, flags);
dest.writeParcelable(roomBackground, flags);
dest.writeByte((byte) (hasKTVPriv ? 1 : 0));
dest.writeByte((byte) (isOpenKTV ? 1 : 0));
dest.writeByte((byte) (isOpenGame ? 1 : 0));
@@ -556,6 +559,59 @@ public class RoomInfo implements Parcelable, Serializable {
}
}
public static class RoomBackgroundBean implements Parcelable {
private int id;
private String picUrl;
protected RoomBackgroundBean(Parcel in) {
id = in.readInt();
picUrl = in.readString();
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(id);
dest.writeString(picUrl);
}
public static final Creator<RoomBackgroundBean> CREATOR = new Creator<RoomBackgroundBean>() {
@Override
public RoomBackgroundBean createFromParcel(Parcel in) {
return new RoomBackgroundBean(in);
}
@Override
public RoomBackgroundBean[] newArray(int size) {
return new RoomBackgroundBean[size];
}
};
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getPicUrl() {
return picUrl;
}
public void setPicUrl(String picUrl) {
this.picUrl = picUrl;
}
@Override
public int describeContents() {
return 0;
}
@Override
public String toString() {
return "RoomBackgroundBean{id=" + id + ", picUrl=\'" + picUrl + '\'' + '}';
}
}
//<editor-fold defaultstate="collapsed" desc="delombok">
@SuppressWarnings("all")
public long getUid() {
@@ -718,6 +774,11 @@ public class RoomInfo implements Parcelable, Serializable {
return this.background;
}
@SuppressWarnings("all")
public RoomBackgroundBean getRoomBackground() {
return this.roomBackground;
}
@SuppressWarnings("all")
public boolean isHasKTVPriv() {
return this.hasKTVPriv;
@@ -1086,6 +1147,11 @@ public class RoomInfo implements Parcelable, Serializable {
this.background = background;
}
@SuppressWarnings("all")
public void setRoomBackground(final RoomBackgroundBean roomBackground) {
this.roomBackground = roomBackground;
}
@SuppressWarnings("all")
public void setHasKTVPriv(final boolean hasKTVPriv) {
this.hasKTVPriv = hasKTVPriv;
@@ -1524,7 +1590,7 @@ public class RoomInfo implements Parcelable, Serializable {
@Override
@SuppressWarnings("all")
public String toString() {
return "RoomInfo(uid=" + this.getUid() + ", officeUser=" + this.getOfficeUser() + ", roomId=" + this.getRoomId() + ", roomUid=" + this.getRoomUid() + ", title=" + this.getTitle() + ", avatar=" + this.getAvatar() + ", type=" + this.getType() + ", roomDesc=" + this.getRoomDesc() + ", backPic=" + this.getBackPic() + ", speakTemplate=" + this.getSpeakTemplate() + ", valid=" + this.isValid() + ", operatorStatus=" + this.getOperatorStatus() + ", hasAnimationEffect=" + this.isHasAnimationEffect() + ", audioQuality=" + this.getAudioQuality() + ", isCloseScreen=" + this.isCloseScreen() + ", serverRedEnvelopeSwitch=" + this.isServerRedEnvelopeSwitch() + ", hasDragonGame=" + this.isHasDragonGame() + ", meetingName=" + this.getMeetingName() + ", roomPwd=" + this.getRoomPwd() + ", sortName=" + this.getSortName() + ", roomTag=" + this.getRoomTag() + ", tagId=" + this.getTagId() + ", tagPict=" + this.getTagPict() + ", onlineNum=" + this.getOnlineNum() + ", isRecom=" + this.getIsRecom() + ", isRoomFans=" + this.isRoomFans() + ", background=" + this.getBackground() + ", hasKTVPriv=" + this.isHasKTVPriv() + ", isOpenKTV=" + this.isOpenKTV() + ", isOpenGame=" + this.isOpenGame() + ", boxSwitchVo=" + this.getBoxSwitchVo() + ", singingMusicName=" + this.getSingingMusicName() + ", limitType=" + this.getLimitType() + ", introduction=" + this.getIntroduction() + ", roomModeType=" + this.getRoomModeType() + ", isPermitRoom=" + this.getIsPermitRoom() + ", isPureMode=" + this.isPureMode() + ", closeBox=" + this.isCloseBox() + ", leaveMode=" + this.isLeaveMode() + ", nick=" + this.getNick() + ", gender=" + this.getGender() + ", worldId=" + this.getWorldId() + ", showPkBeginTime=" + this.isShowPkBeginTime() + ", pkBeginTime=" + this.getPkBeginTime() + ", pkMatchStartTime=" + this.getPkMatchStartTime() + ", hasWishGiftPermit=" + this.isHasWishGiftPermit() + ", hasOpenWishGift=" + this.isHasOpenWishGift() + ", showGiftValue=" + this.isShowGiftValue() + ", hideFlag=" + this.getHideFlag() + ", closeScreenFlag=" + this.getCloseScreenFlag() + ", redEnvelopeOpen=" + this.isRedEnvelopeOpen() + ", blindDateState=" + this.getBlindDateState() + ", blindDateVipUid=" + this.getBlindDateVipUid() + ", canOpenBlindDate=" + this.isCanOpenBlindDate() + ", audioSdkType=" + this.getAudioSdkType() + ", trtcSig=" + this.getTrtcSig() + ", isReselect=" + this.isReselect() + ", mgId=" + this.getMgId() + ", mgName=" + this.getMgName() + ", mgMicNum=" + this.getMgMicNum() + ", clearScreenTime=" + this.getClearScreenTime() + ", hasPrivilegeCardPermit=" + this.isHasPrivilegeCardPermit() + ", hasRoomPrivilegeCard=" + this.isHasRoomPrivilegeCard() + ")";
return "RoomInfo(uid=" + this.getUid() + ", officeUser=" + this.getOfficeUser() + ", roomId=" + this.getRoomId() + ", roomUid=" + this.getRoomUid() + ", title=" + this.getTitle() + ", avatar=" + this.getAvatar() + ", type=" + this.getType() + ", roomDesc=" + this.getRoomDesc() + ", backPic=" + this.getBackPic() + ", speakTemplate=" + this.getSpeakTemplate() + ", valid=" + this.isValid() + ", operatorStatus=" + this.getOperatorStatus() + ", hasAnimationEffect=" + this.isHasAnimationEffect() + ", audioQuality=" + this.getAudioQuality() + ", isCloseScreen=" + this.isCloseScreen() + ", serverRedEnvelopeSwitch=" + this.isServerRedEnvelopeSwitch() + ", hasDragonGame=" + this.isHasDragonGame() + ", meetingName=" + this.getMeetingName() + ", roomPwd=" + this.getRoomPwd() + ", sortName=" + this.getSortName() + ", roomTag=" + this.getRoomTag() + ", tagId=" + this.getTagId() + ", tagPict=" + this.getTagPict() + ", onlineNum=" + this.getOnlineNum() + ", isRecom=" + this.getIsRecom() + ", isRoomFans=" + this.isRoomFans() + ", background=" + this.getBackground() + ", roomBackground=" + this.getRoomBackground() + ", hasKTVPriv=" + this.isHasKTVPriv() + ", isOpenKTV=" + this.isOpenKTV() + ", isOpenGame=" + this.isOpenGame() + ", boxSwitchVo=" + this.getBoxSwitchVo() + ", singingMusicName=" + this.getSingingMusicName() + ", limitType=" + this.getLimitType() + ", introduction=" + this.getIntroduction() + ", roomModeType=" + this.getRoomModeType() + ", isPermitRoom=" + this.getIsPermitRoom() + ", isPureMode=" + this.isPureMode() + ", closeBox=" + this.isCloseBox() + ", leaveMode=" + this.isLeaveMode() + ", nick=" + this.getNick() + ", gender=" + this.getGender() + ", worldId=" + this.getWorldId() + ", showPkBeginTime=" + this.isShowPkBeginTime() + ", pkBeginTime=" + this.getPkBeginTime() + ", pkMatchStartTime=" + this.getPkMatchStartTime() + ", hasWishGiftPermit=" + this.isHasWishGiftPermit() + ", hasOpenWishGift=" + this.isHasOpenWishGift() + ", showGiftValue=" + this.isShowGiftValue() + ", hideFlag=" + this.getHideFlag() + ", closeScreenFlag=" + this.getCloseScreenFlag() + ", redEnvelopeOpen=" + this.isRedEnvelopeOpen() + ", blindDateState=" + this.getBlindDateState() + ", blindDateVipUid=" + this.getBlindDateVipUid() + ", canOpenBlindDate=" + this.isCanOpenBlindDate() + ", audioSdkType=" + this.getAudioSdkType() + ", trtcSig=" + this.getTrtcSig() + ", isReselect=" + this.isReselect() + ", mgId=" + this.getMgId() + ", mgName=" + this.getMgName() + ", mgMicNum=" + this.getMgMicNum() + ", clearScreenTime=" + this.getClearScreenTime() + ", hasPrivilegeCardPermit=" + this.isHasPrivilegeCardPermit() + ", hasRoomPrivilegeCard=" + this.isHasRoomPrivilegeCard() + ")";
}
//</editor-fold>
}

3
core/src/model_labour_union/java/com/nnbc123/core/module_hall/income/IIncomeModel.java
View File

@@ -2,6 +2,7 @@ package com.nnbc123.core.module_hall.income;
import com.nnbc123.core.base.IModel;
import com.nnbc123.core.module_hall.income.bean.ClanTotalIncomeInfo;
import com.nnbc123.core.module_hall.income.bean.HallTotalIncomeInfo;
import com.nnbc123.core.module_hall.income.bean.IncomeGiftInfo;
import com.nnbc123.core.module_hall.income.bean.IncomeTotalInfo;
import com.nnbc123.core.module_hall.income.bean.SingleRoomTotalIncomeInfo;
@@ -16,6 +17,8 @@ public interface IIncomeModel extends IModel {
Single<ClanTotalIncomeInfo> getClanIncomeList(long clanId, String startTimeStr, String endTimeStr);
Single<HallTotalIncomeInfo> getHallIncomeList(long clanId, String startTimeStr, String endTimeStr);
Single<SingleRoomTotalIncomeInfo> getSingleRoomIncomeList(String hallId, String clanId,String startTime, String endTime);
Single<List<IncomeGiftInfo>> incomeDetail(long memberId, long hallId, String startTimeStr, String endTimeStr);

24
core/src/model_labour_union/java/com/nnbc123/core/module_hall/income/IncomeModel.java
View File

@@ -4,6 +4,7 @@ import com.nnbc123.core.auth.AuthModel;
import com.nnbc123.core.base.BaseModel;
import com.nnbc123.core.bean.response.ServiceResult;
import com.nnbc123.core.module_hall.income.bean.ClanTotalIncomeInfo;
import com.nnbc123.core.module_hall.income.bean.HallTotalIncomeInfo;
import com.nnbc123.core.module_hall.income.bean.IncomeGiftInfo;
import com.nnbc123.core.module_hall.income.bean.IncomeTotalInfo;
import com.nnbc123.core.module_hall.income.bean.SingleRoomTotalIncomeInfo;
@@ -56,6 +57,20 @@ public class IncomeModel extends BaseModel implements IIncomeModel {
});
}
@Override
public Single<HallTotalIncomeInfo> getHallIncomeList(long hallId, String startTime, String endTime) {
return api.getHallIncomeList(AuthModel.get().getCurrentUid(), hallId, startTime, endTime)
.compose(RxHelper.handleSchAndExce())
.flatMap((Function<ServiceResult<HallTotalIncomeInfo>, SingleSource<HallTotalIncomeInfo>>) response -> {
if (response.isSuccess()) {
return Single.just(response.getData());
} else {
return Single.error(new Throwable(response.getMessage()));
}
});
}
@Override
public Single<SingleRoomTotalIncomeInfo> getSingleRoomIncomeList(String clanId, String hallId, String startTime, String endTime) {
return api.getSingleRoomIncomeList(clanId, hallId, startTime, endTime)
@@ -105,6 +120,15 @@ public class IncomeModel extends BaseModel implements IIncomeModel {
@Query("startTime") String startTime,
@Query("endTime") String endTime);
/**
* 获取公会收入列表
*/
@GET("/income/totalList")
Single<ServiceResult<HallTotalIncomeInfo>> getHallIncomeList(@Query("uid") long uid,
@Query("hallId") long hallId,
@Query("startTime") String startTime,
@Query("endTime") String endTime);
/**
* 获取个播房收入列表
*/

147
core/src/model_labour_union/java/com/nnbc123/core/module_hall/income/bean/HallIncomeInfo.java Normal file
View File

@@ -0,0 +1,147 @@
package com.nnbc123.core.module_hall.income.bean;
import java.io.Serializable;
public class HallIncomeInfo implements Serializable {
private double bagIncome;
private String hallAvatar;
private String hallName;
private double roomIncome;
private double normalGiftIncome;
private String giftUv;
private String newUserSendGiftNum;
//<editor-fold defaultstate="collapsed" desc="delombok">
@SuppressWarnings("all")
public HallIncomeInfo() {
}
@SuppressWarnings("all")
public double getBagIncome() {
return this.bagIncome;
}
@SuppressWarnings("all")
public String getHallAvatar() {
return this.hallAvatar;
}
@SuppressWarnings("all")
public String getHallName() {
return this.hallName;
}
@SuppressWarnings("all")
public double getRoomIncome() {
return this.roomIncome;
}
@SuppressWarnings("all")
public double getNormalGiftIncome() {
return this.normalGiftIncome;
}
@SuppressWarnings("all")
public String getGiftUv() {
return this.giftUv;
}
@SuppressWarnings("all")
public String getNewUserSendGiftNum() {
return this.newUserSendGiftNum;
}
@SuppressWarnings("all")
public void setBagIncome(final double bagIncome) {
this.bagIncome = bagIncome;
}
@SuppressWarnings("all")
public void setHallAvatar(final String hallAvatar) {
this.hallAvatar = hallAvatar;
}
@SuppressWarnings("all")
public void setHallName(final String hallName) {
this.hallName = hallName;
}
@SuppressWarnings("all")
public void setRoomIncome(final double roomIncome) {
this.roomIncome = roomIncome;
}
@SuppressWarnings("all")
public void setNormalGiftIncome(final double normalGiftIncome) {
this.normalGiftIncome = normalGiftIncome;
}
@SuppressWarnings("all")
public void setGiftUv(final String giftUv) {
this.giftUv = giftUv;
}
@SuppressWarnings("all")
public void setNewUserSendGiftNum(final String newUserSendGiftNum) {
this.newUserSendGiftNum = newUserSendGiftNum;
}
@Override
@SuppressWarnings("all")
public boolean equals(final Object o) {
if (o == this) return true;
if (!(o instanceof HallIncomeInfo)) return false;
final HallIncomeInfo other = (HallIncomeInfo) o;
if (!other.canEqual((Object) this)) return false;
if (Double.compare(this.getBagIncome(), other.getBagIncome()) != 0) return false;
if (Double.compare(this.getRoomIncome(), other.getRoomIncome()) != 0) return false;
if (Double.compare(this.getNormalGiftIncome(), other.getNormalGiftIncome()) != 0) return false;
final Object this$hallAvatar = this.getHallAvatar();
final Object other$hallAvatar = other.getHallAvatar();
if (this$hallAvatar == null ? other$hallAvatar != null : !this$hallAvatar.equals(other$hallAvatar)) return false;
final Object this$hallName = this.getHallName();
final Object other$hallName = other.getHallName();
if (this$hallName == null ? other$hallName != null : !this$hallName.equals(other$hallName)) return false;
final Object this$giftUv = this.getGiftUv();
final Object other$giftUv = other.getGiftUv();
if (this$giftUv == null ? other$giftUv != null : !this$giftUv.equals(other$giftUv)) return false;
final Object this$newUserSendGiftNum = this.getNewUserSendGiftNum();
final Object other$newUserSendGiftNum = other.getNewUserSendGiftNum();
if (this$newUserSendGiftNum == null ? other$newUserSendGiftNum != null : !this$newUserSendGiftNum.equals(other$newUserSendGiftNum)) return false;
return true;
}
@SuppressWarnings("all")
protected boolean canEqual(final Object other) {
return other instanceof HallIncomeInfo;
}
@Override
@SuppressWarnings("all")
public int hashCode() {
final int PRIME = 59;
int result = 1;
final long $bagIncome = Double.doubleToLongBits(this.getBagIncome());
result = result * PRIME + (int) ($bagIncome >>> 32 ^ $bagIncome);
final long $roomIncome = Double.doubleToLongBits(this.getRoomIncome());
result = result * PRIME + (int) ($roomIncome >>> 32 ^ $roomIncome);
final long $normalGiftIncome = Double.doubleToLongBits(this.getNormalGiftIncome());
result = result * PRIME + (int) ($normalGiftIncome >>> 32 ^ $normalGiftIncome);
final Object $hallAvatar = this.getHallAvatar();
result = result * PRIME + ($hallAvatar == null ? 43 : $hallAvatar.hashCode());
final Object $hallName = this.getHallName();
result = result * PRIME + ($hallName == null ? 43 : $hallName.hashCode());
final Object $giftUv = this.getGiftUv();
result = result * PRIME + ($giftUv == null ? 43 : $giftUv.hashCode());
final Object $newUserSendGiftNum = this.getNewUserSendGiftNum();
result = result * PRIME + ($newUserSendGiftNum == null ? 43 : $newUserSendGiftNum.hashCode());
return result;
}
@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() + ")";
}
//</editor-fold>
}

71
core/src/model_labour_union/java/com/nnbc123/core/module_hall/income/bean/HallTotalIncomeInfo.java Normal file
View File

@@ -0,0 +1,71 @@
package com.nnbc123.core.module_hall.income.bean;
import java.util.List;
public class HallTotalIncomeInfo {
private double total;
private List<HallIncomeInfo> income;
//<editor-fold defaultstate="collapsed" desc="delombok">
@SuppressWarnings("all")
public HallTotalIncomeInfo() {
}
@SuppressWarnings("all")
public double getTotal() {
return this.total;
}
@SuppressWarnings("all")
public List<HallIncomeInfo> getIncome() {
return this.income;
}
@SuppressWarnings("all")
public void setTotal(final double total) {
this.total = total;
}
@SuppressWarnings("all")
public void setIncome(final List<HallIncomeInfo> income) {
this.income = income;
}
@Override
@SuppressWarnings("all")
public boolean equals(final Object o) {
if (o == this) return true;
if (!(o instanceof HallTotalIncomeInfo)) return false;
final HallTotalIncomeInfo other = (HallTotalIncomeInfo) o;
if (!other.canEqual((Object) this)) return false;
if (Double.compare(this.getTotal(), other.getTotal()) != 0) return false;
final Object this$income = this.getIncome();
final Object other$income = other.getIncome();
if (this$income == null ? other$income != null : !this$income.equals(other$income)) return false;
return true;
}
@SuppressWarnings("all")
protected boolean canEqual(final Object other) {
return other instanceof HallTotalIncomeInfo;
}
@Override
@SuppressWarnings("all")
public int hashCode() {
final int PRIME = 59;
int result = 1;
final long $total = Double.doubleToLongBits(this.getTotal());
result = result * PRIME + (int) ($total >>> 32 ^ $total);
final Object $income = this.getIncome();
result = result * PRIME + ($income == null ? 43 : $income.hashCode());
return result;
}
@Override
@SuppressWarnings("all")
public String toString() {
return "ClanTotalIncomeInfo(total=" + this.getTotal() + ", income=" + this.getIncome() + ")";
}
//</editor-fold>
}