moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

铭牌，装饰，礼物值bugfix

Browse Source
This commit is contained in:
oujunhui
2020-05-25 15:20:39 +08:00
parent 1b005e3d22
commit 25a720cb2b
11 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java
View File

@@ -46,9 +46,9 @@ public class RouterType {
public static final int DECORATION = 8;
/**
* 9-家族钻石 传参：家族 id(FamilyId) 跳转到家族钻石页面;
* 9-铭牌 传参：0（装扮商城） 或者 1（铭牌库）
*/
public static final int SYS_MSG = 9;
public static final int NAMEPLATE = 9;
/**
* 10-家族 传参：家族 id(FamilyId) 跳转到家族客态页;

16
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
View File

@@ -172,8 +172,8 @@ public class GiftValueMrg {
if (roomQueueInfo.giftValueData == null) {
roomQueueInfo.giftValueData = new GiftValueData();
}
long value = giftValueArray.get(micUid, 0L);
if (value > 0) {
long value = giftValueArray.get(micUid, -1L);
if (value >= 0) {
roomQueueInfo.giftValueData.updateValue(value);
}
} else if (key == -1 && AvRoomDataManager.get().isLeaveMode()) { // 离开模式礼物值变化
@@ -181,8 +181,8 @@ public class GiftValueMrg {
if (roomQueueInfo.giftValueData == null) {
roomQueueInfo.giftValueData = new GiftValueData();
}
long value = giftValueArray.get(micUid, 0L);
if (value > 0) {
long value = giftValueArray.get(micUid, -1L);
if (value >= 0) {
roomQueueInfo.giftValueData.updateValue(value);
}
}
@@ -212,15 +212,15 @@ public class GiftValueMrg {
GiftValueData giftValueData = roomQueueInfo.giftValueData;
if (roomQueueInfo.mChatRoomMember != null) {
long micUid = JavaUtil.str2long(roomQueueInfo.mChatRoomMember.getAccount());
long newValue = array.get(micUid, 0L);
if (newValue > 0){
long newValue = array.get(micUid, -1L);
if (newValue >= 0){
giftValueData.updateValue(newValue);
}
} else {
if (AvRoomDataManager.get().isLeaveMode() && key == -1) { // 离开模式礼物值变化
long micUid = AvRoomDataManager.get().getRoomUid();
long newValue = array.get(micUid, 0L);
if (newValue > 0){
long newValue = array.get(micUid, -1L);
if (newValue >= 0){
giftValueData.updateValue(newValue);
}
} else{