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

[Modify]特权卡功能实现

Browse Source
This commit is contained in:
wushaocheng
2023-07-27 16:13:54 +08:00
parent ce93e02d8a
commit 7a7a394b03
51 changed files with 2124 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/diff_src_erban/java/com/nnbc123/core/UriProvider.java
View File

@@ -504,4 +504,11 @@ public class UriProvider {
return WEB_URL.concat("/yinmeng/activity/act-sail/more.html");
}
/**
* 用户特权卡使用说明
*/
public static String getPrivilegeInstructions() {
return WEB_URL.concat("/yinmeng/modules/privilegeCardRule/index.html");
}
}

26
core/src/diff_src_erban/java/com/nnbc123/core/privilege/bean/PrivilegeCardInfo.kt Normal file
View File

@@ -0,0 +1,26 @@
package com.nnbc123.core.privilege.bean
import java.io.Serializable
data class PrivilegeCardInfo(
val cardName: String = "",
val cardStatus: Int = 0,
val cardUrl: String = "",
val checkReason: String = "",
val checkTime: String = "",
val createTime: String = "",
val dailyNum: Int = 0,
val description: String = "",
val effectDay: Int = 0,
val effectTime: String = "",
val erbanNoStr: String = "",
val expireTime: String = "",
val id: Int = 0,
val isDeleted: Int = 0,
val isManual: Int = 0,
val operateTime: String = "",
val operatorId: Int = 0,
val roomUid: Int = 0,
val uidStr: String = "",
val updateTime: String = ""
) : Serializable

73
core/src/diff_src_erban/java/com/nnbc123/core/privilege/model/PrivilegeModel.kt Normal file
View File

@@ -0,0 +1,73 @@
package com.nnbc123.core.privilege.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.utils.net.launchRequest
import com.nnbc123.library.net.rxnet.RxNet
import retrofit2.http.GET
import retrofit2.http.POST
import retrofit2.http.Query
object PrivilegeModel : BaseModel() {
private val api = RxNet.create(Api::class.java)
suspend fun getPrivilegeCardList(cardStatus: String, roomUid : String): List<PrivilegeCardInfo>? =
launchRequest {
api.getPrivilegeCardList(cardStatus, roomUid)
}
suspend fun savePrivilegeCard(cardName: String, dailyNum: Int, description: String, effectDay: Int, erbanNoStr: String, cardUrl: String, roomUid: String): String? =
launchRequest {
api.savePrivilegeCard(cardName, dailyNum, description, effectDay, erbanNoStr, cardUrl, roomUid)
}
suspend fun deletePrivilegeCard(id: Int): String? =
launchRequest {
api.deletePrivilegeCard(id)
}
private interface Api {
/**
* 特权卡列表
*
* @return
*/
@GET("/privilegeCard/list")
suspend fun getPrivilegeCardList(
@Query("cardStatus") cardStatus: String,
@Query("roomUid") roomUid: String
): ServiceResult<List<PrivilegeCardInfo>>
/**
* 保存特权卡
*
* @return
*/
@POST("/privilegeCard/save")
suspend fun savePrivilegeCard(
@Query("cardName") cardName: String,
@Query("dailyNum") dailyNum: Int,
@Query("description") description: String,
@Query("effectDay") effectDay: Int,
@Query("erbanNoStr") erbanNoStr: String,
@Query("cardUrl") cardUrl: String,
@Query("roomUid") roomUid: String
): ServiceResult<String>
/**
* 删除特权卡
*
* @return
*/
@GET("/privilegeCard/del")
suspend fun deletePrivilegeCard(
@Query("id") id: Int
): ServiceResult<String>
}
}

54
core/src/main/java/com/nnbc123/core/gift/GiftModel.java
View File

@@ -10,8 +10,6 @@ import android.util.Log;
import androidx.annotation.Nullable;
import com.nnbc123.core.gift.bean.LuckyBagNoticeInfo;
import com.nnbc123.core.gift.bean.WeekStarInfo;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
@@ -21,12 +19,15 @@ import com.nnbc123.core.bean.response.ServiceResult;
import com.nnbc123.core.gift.bean.GiftInfo;
import com.nnbc123.core.gift.bean.GiftListInfo;
import com.nnbc123.core.gift.bean.GiftMultiReceiverInfo;
import com.nnbc123.core.gift.bean.GiftPrivilegeInfo;
import com.nnbc123.core.gift.bean.GiftSendType;
import com.nnbc123.core.gift.bean.GiftSource;
import com.nnbc123.core.gift.bean.GiftType;
import com.nnbc123.core.gift.bean.LuckyBagGifts;
import com.nnbc123.core.gift.bean.LuckyBagNoticeInfo;
import com.nnbc123.core.gift.bean.MultiGiftReceiveInfo;
import com.nnbc123.core.gift.bean.SimpleVipInfo;
import com.nnbc123.core.gift.bean.WeekStarInfo;
import com.nnbc123.core.gift.event.UpdateKnapEvent;
import com.nnbc123.core.gift.exception.GiftOutOfDateException;
import com.nnbc123.core.gift.toolbox.GiftToolbox;
@@ -81,6 +82,7 @@ public class GiftModel extends BaseModel implements IGiftModel {
private UiHandler handler;
private GiftListInfo allGiftListInfo;
private List<GiftInfo> knapList;
private List<GiftPrivilegeInfo> privilegeList;
private List<CustomAttachment> giftQueue;
private GiftModel() {
@@ -170,6 +172,36 @@ public class GiftModel extends BaseModel implements IGiftModel {
return new ArrayList<>();
}
/**
* 礼物特权卡的礼物数据
*
* @return
*/
@Override
public Single<ServiceResult<List<GiftPrivilegeInfo>>> requestPrivilegeGiftInfos() {
return api.getGiftPrivilegeList(AuthModel.get().getCurrentUid() + "", AvRoomDataManager.get().getRoomUid() + "").compose(new Transformer<>()).doOnSuccess(response -> {
if (response.isSuccess()) {
privilegeList = response.getData();
}
});
}
@Override
public Single<ServiceResult<String>> givePrivilegeCard(String cardId, String roomUid, String sendUid) {
return api.givePrivilegeCard(cardId, roomUid, sendUid).compose(new Transformer<>()).doOnSuccess(response -> {
});
}
@Override
public List<GiftPrivilegeInfo> getPrivilegeList() {
if (privilegeList != null) {
return privilegeList;
} else {
requestPrivilegeGiftInfos().subscribe();
}
return new ArrayList<>();
}
@Override
public List<GiftInfo> getGiftInfoList(int giftType) {
return getGiftInfosByType(null, giftType);
@@ -666,6 +698,24 @@ public class GiftModel extends BaseModel implements IGiftModel {
@GET("backpack/listUserBackpackV2")
Single<ServiceResult<List<GiftInfo>>> getGiftKnapList(@Query("uid") String uid);
/**
* 获取特权卡里面的东西列表
*
* @param uid
* @return
*/
@GET("/privilegeCard/tab")
Single<ServiceResult<List<GiftPrivilegeInfo>>> getGiftPrivilegeList(@Query("uid") String uid, @Query("roomUid") String roomUid);
/**
* 赠送特权卡
*
* @return
*/
@POST("/privilegeCard/send")
@FormUrlEncoded
Single<ServiceResult<String>> givePrivilegeCard(@Field("cardId") String cardId, @Field("roomUid") String roomUid, @Field("sendUid") String sendUid);
/**
* 送礼物
*

22
core/src/main/java/com/nnbc123/core/gift/IGiftModel.java
View File

@@ -2,6 +2,7 @@ package com.nnbc123.core.gift;
import androidx.annotation.Nullable;
import com.nnbc123.core.gift.bean.GiftPrivilegeInfo;
import com.nnbc123.core.gift.bean.LuckyBagNoticeInfo;
import com.nnbc123.core.gift.bean.WeekStarInfo;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -39,6 +40,20 @@ public interface IGiftModel {
*/
Single<ServiceResult<List<GiftInfo>>> requestKnapGiftInfos();
/**
* 加载特权卡礼物
*
* @return
*/
Single<ServiceResult<List<GiftPrivilegeInfo>>> requestPrivilegeGiftInfos();
/**
* 赠送特权卡
*
* @return
*/
Single<ServiceResult<String>> givePrivilegeCard(String cardId, String roomUid, String sendUid);
/**
* 从内存里取出背包礼物列表
*
@@ -46,6 +61,13 @@ public interface IGiftModel {
*/
List<GiftInfo> getKnapList();
/**
* 从内存里取出特权礼物列表
*
* @return
*/
List<GiftPrivilegeInfo> getPrivilegeList();
/**
* 从内存里取出背包礼物列表
*

30
core/src/main/java/com/nnbc123/core/gift/bean/GiftPrivilegeInfo.kt Normal file
View File

@@ -0,0 +1,30 @@
package com.nnbc123.core.gift.bean
import java.io.Serializable
/**
* 特权卡
*/
data class GiftPrivilegeInfo(
val cardName: String = "",
val cardStatus: Int = 0,
val cardUrl: String = "",
val checkReason: String = "",
val checkTime: String = "",
val createTime: String = "",
var dailyNum: Int = 0,
val description: String = "",
val effectDay: Int = 0,
val effectTime: String = "",
val erbanNoStr: String = "",
val expireTime: String = "",
val id: Int = 0,
val isDeleted: Int = 0,
val isManual: Int = 0,
val operateTime: String = "",
val operatorId: Int = 0,
val roomUid: Int = 0,
val uidStr: String = "",
val updateTime: String = "",
var isSelected: Boolean = false
) : Serializable

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

@@ -211,6 +211,14 @@ public final class AvRoomDataManager {
* 是否从师徒任务中跳转进来的
*/
private boolean isFromMentoring;
/**
* 是否拥有特权卡权限
*/
private boolean hasPrivilegeCardPermit;
/**
* 是否有房间特权卡
*/
private boolean hasRoomPrivilegeCard;
/**
* 嗨聊房列表
*/
@@ -291,6 +299,8 @@ public final class AvRoomDataManager {
hasWishGiftPermit = roomInfo.isHasWishGiftPermit();
hasOpenWishGift = roomInfo.isHasOpenWishGift();
pkMatchStartTime = roomInfo.getPkMatchStartTime();
hasPrivilegeCardPermit = roomInfo.isHasPrivilegeCardPermit();
hasRoomPrivilegeCard = roomInfo.isHasRoomPrivilegeCard();
}
/**
@@ -1200,6 +1210,22 @@ public final class AvRoomDataManager {
isFromMentoring = fromMentoring;
}
public boolean isHasPrivilegeCardPermit() {
return hasPrivilegeCardPermit;
}
public void setPrivilegeCardPermit(boolean hasPrivilegeCardPermit) {
this.hasPrivilegeCardPermit = hasPrivilegeCardPermit;
}
public boolean isHasRoomPrivilegeCard() {
return hasRoomPrivilegeCard;
}
public void setRoomPrivilegeCard(boolean hasRoomPrivilegeCard) {
this.hasRoomPrivilegeCard = hasRoomPrivilegeCard;
}
public long getMasterUid() {
return masterUid;
}

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

@@ -124,6 +124,14 @@ public class RoomInfo implements Parcelable, Serializable {
* 是否已经开启心愿礼物
*/
private boolean hasOpenWishGift;
/**
* 是否拥有特权卡权限
*/
private boolean hasPrivilegeCardPermit;
/**
* 是否有房间特权卡
*/
private boolean hasRoomPrivilegeCard;
protected RoomInfo(Parcel in) {
uid = in.readLong();
@@ -184,6 +192,8 @@ public class RoomInfo implements Parcelable, Serializable {
mgName = in.readString();
mgMicNum = in.readInt();
clearScreenTime = in.readLong();
hasPrivilegeCardPermit = in.readByte() != 0;
hasRoomPrivilegeCard = in.readByte() != 0;
}
@Override
@@ -246,6 +256,8 @@ public class RoomInfo implements Parcelable, Serializable {
dest.writeString(mgName);
dest.writeInt(mgMicNum);
dest.writeLong(clearScreenTime);
dest.writeByte((byte) (hasPrivilegeCardPermit ? 1 : 0));
dest.writeByte((byte) (hasRoomPrivilegeCard ? 1 : 0));
}
@Override
@@ -1283,6 +1295,14 @@ public class RoomInfo implements Parcelable, Serializable {
this.clearScreenTime = clearScreenTime;
}
public boolean isHasPrivilegeCardPermit() {
return hasPrivilegeCardPermit;
}
public boolean isHasRoomPrivilegeCard() {
return hasRoomPrivilegeCard;
}
@Override
@SuppressWarnings("all")
public boolean equals(final Object o) {
@@ -1298,6 +1318,8 @@ public class RoomInfo implements Parcelable, Serializable {
if (this.isValid() != other.isValid()) return false;
if (this.getOperatorStatus() != other.getOperatorStatus()) return false;
if (this.isHasAnimationEffect() != other.isHasAnimationEffect()) return false;
if (this.isHasPrivilegeCardPermit() != other.isHasPrivilegeCardPermit()) return false;
if (this.isHasRoomPrivilegeCard() != other.isHasRoomPrivilegeCard()) return false;
if (this.getAudioQuality() != other.getAudioQuality()) return false;
if (this.isCloseScreen() != other.isCloseScreen()) return false;
if (this.isServerRedEnvelopeSwitch() != other.isServerRedEnvelopeSwitch()) return false;
@@ -1415,6 +1437,8 @@ public class RoomInfo implements Parcelable, Serializable {
result = result * PRIME + (this.isValid() ? 79 : 97);
result = result * PRIME + this.getOperatorStatus();
result = result * PRIME + (this.isHasAnimationEffect() ? 79 : 97);
result = result * PRIME + (this.isHasPrivilegeCardPermit() ? 79 : 97);
result = result * PRIME + (this.isHasRoomPrivilegeCard() ? 79 : 97);
result = result * PRIME + this.getAudioQuality();
result = result * PRIME + (this.isCloseScreen() ? 79 : 97);
result = result * PRIME + (this.isServerRedEnvelopeSwitch() ? 79 : 97);
@@ -1500,7 +1524,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() + ")";
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() + ")";
}
//</editor-fold>
}