去掉红包金额小数点,屏蔽“***抢***的红包进房间”
This commit is contained in:
@@ -2253,6 +2253,7 @@ public class HomePartyRoomFragment extends BaseMvpFragment<IHomePartyView, HomeP
|
||||
RedPackageModel.INSTANCE.setRedPackageSwitch(AvRoomDataManager.get().getRoomUid()).subscribe(setIsNeedOpenRedPackage -> {
|
||||
roomInfo.setServerRedEnvelopeSwitch(setIsNeedOpenRedPackage);
|
||||
IMNetEaseManager.get().closeOpenRedPackage(roomInfo.getRoomId(),roomInfo);
|
||||
SingleToastUtil.showToastShort(setIsNeedOpenRedPackage?"全服红包通知已开启":"全服红包通知已关闭");
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -316,7 +316,7 @@ public class AvRoomPresenter extends BaseMvpPresenter<IAvRoomView> {
|
||||
String roomInfoStr = (String) extension.get(Constants.KEY_CHAT_ROOM_INFO_ROOM);
|
||||
if (!TextUtils.isEmpty(roomInfoStr)) {
|
||||
RoomInfo extRoomInfo = mGson.fromJson(roomInfoStr, RoomInfo.class);
|
||||
extRoomInfo.setRoomId(Long.valueOf(roomInfo.getRoomId()));
|
||||
extRoomInfo.setRoomId(Long.parseLong(roomInfo.getRoomId()));
|
||||
extRoomInfo.setServerRedEnvelopeSwitch(AvRoomDataManager.get().mCurrentRoomInfo.serverRedEnvelopeSwitch);
|
||||
extRoomInfo.onlineNum = AvRoomDataManager.get().mCurrentRoomInfo.onlineNum;
|
||||
//云信服务端信息
|
||||
|
@@ -23,7 +23,7 @@ class RedPackageOpenAdapter : BaseQuickAdapter<RedEnvelopeItemVO, BaseViewHolder
|
||||
helper.setText(R.id.tv_nickname, if (isSelf) "我" else item.userVO.nick.subAndReplaceDot(6))
|
||||
.setTextColor(R.id.tv_nickname, Color.parseColor(if (isSelf) "#FDCD00" else "#FFFFFF"))
|
||||
.setText(R.id.tv_time, dateFormat.format(item.createTime))
|
||||
.setText(R.id.tv_diamond_num, item.amount)
|
||||
.setText(R.id.tv_diamond_num, item.amount.substringBefore("."))
|
||||
|
||||
item.redEnvelopeGiftItemVOs?.let {
|
||||
if (it.isNotEmpty()) {
|
||||
|
@@ -150,7 +150,7 @@ class RedPackageOpenDialog : BaseDialog<DialogRedPackageOpenBinding>() {
|
||||
.build()
|
||||
}
|
||||
}
|
||||
binding.tvDiamondNum.text = it.amount
|
||||
binding.tvDiamondNum.text = it.amount.substringBefore(".")
|
||||
}
|
||||
if (!AvRoomDataManager.get().isRoomFans){
|
||||
AvRoomDataManager.get().roomUid?.let {
|
||||
|
@@ -861,13 +861,13 @@ public class MessageView extends FrameLayout {
|
||||
case ALL_DIAMOND:
|
||||
case ROOM_DIAMOND:
|
||||
text.append("的红包领取了", new ForegroundColorSpan(textColor))
|
||||
.append(roomMsg.getAmount() + "钻石", new ForegroundColorSpan(roomTipColor));
|
||||
.append((int)roomMsg.getAmount() + "钻石", new ForegroundColorSpan(roomTipColor));
|
||||
tvContent.setText(text.build());
|
||||
break;
|
||||
case ALL_GIFT:
|
||||
case ROOM_GIFT:
|
||||
text.append("的红包领取了价值", new ForegroundColorSpan(textColor))
|
||||
.append(roomMsg.getAmount() + "钻石", new ForegroundColorSpan(roomTipColor))
|
||||
.append((int)roomMsg.getAmount() + "钻石", new ForegroundColorSpan(roomTipColor))
|
||||
.append("的礼物", new ForegroundColorSpan(textColor));
|
||||
tvContent.setText(text.build());
|
||||
}
|
||||
@@ -2064,11 +2064,11 @@ public class MessageView extends FrameLayout {
|
||||
}
|
||||
}
|
||||
});
|
||||
if (fromType == AVRoomActivity.FROM_TYPE_ALL_RED){
|
||||
text.append("抢")
|
||||
.append(workAuthor)
|
||||
.append("的红包");
|
||||
}
|
||||
// if (fromType == AVRoomActivity.FROM_TYPE_ALL_RED){
|
||||
// text.append("抢")
|
||||
// .append(workAuthor)
|
||||
// .append("的红包");
|
||||
// }
|
||||
text.append(TextUtils.isEmpty(carName) ? "" : " 驾着 ", new ForegroundColorSpan(greyColor))
|
||||
.append(carName, new ForegroundColorSpan(roomTipColor))
|
||||
.append(" 进入了房间 ", new ForegroundColorSpan(greyColor));
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 8.9 KiB |
Reference in New Issue
Block a user