diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index dfc5465a4..2b4052028 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1243,7 +1243,7 @@ Limited ride And limited avatar frame 贈送主播禮物表達心意 倒計時:%s 待開紅包:%s - 來自%s的獎勵,齊心協力連成目標 + %s的紅包 很遺憾 與紅包擦肩而過 查看大家手氣 diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 1c91bd117..8b1e4dfa2 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1452,6 +1452,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis } else { redPacketQueue.setVisibility(View.VISIBLE); redPacketCountdown.setVisibility(View.GONE); + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(mRedPacketModel.getRedPacketRemain() ) + .append("/") + .append(mRedPacketModel.getRedPacketQuantity()); + redSchedule.setText(stringBuffer.toString()); + openRedPacket.setText(String.format(mContext.getString(R.string.open_red_packet), mRedPacketModel.getRedPacketCount()+ "")); } if (IMLoginManager.get(mContext).getUserInfo().anchorUserType() && mContext instanceof LiveRyAnchorActivity) { anchorTimeHandler.removeCallbacks(anchorTimeRunnable); diff --git a/live/src/main/java/com/yunbao/live/views/RedPacketGiftViewHolder.java b/live/src/main/java/com/yunbao/live/views/RedPacketGiftViewHolder.java index 0afe1de06..25b708e19 100644 --- a/live/src/main/java/com/yunbao/live/views/RedPacketGiftViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/RedPacketGiftViewHolder.java @@ -22,6 +22,6 @@ public class RedPacketGiftViewHolder extends RecyclerView.ViewHolder { public void showData(RedPacketGiftModel redPacketGiftModel) { ImgLoader.displayAvatar(itemView.getContext(), redPacketGiftModel.getGifticon(), giftIcon); - giftName.setText(redPacketGiftModel.getGiftNum()); + giftName.setText("X"+redPacketGiftModel.getGiftNum()); } }