From c139b0341706d33dd654fdc872a082a1491ddb56 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 4 Jul 2023 17:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/src/main/res/values/strings.xml                      | 2 +-
 .../main/java/com/yunbao/live/views/LiveRoomViewHolder.java | 6 ++++++
 .../java/com/yunbao/live/views/RedPacketGiftViewHolder.java | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

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</string>
     <string name="anchor_his_heart">贈送主播禮物表達心意</string>
     <string name="red_packet_countdown">倒計時:%s</string>
     <string name="open_red_packet">待開紅包:%s</string>
-    <string name="together_to_achieve_goal">來自%s的獎勵，齊心協力連成目標</string>
+    <string name="together_to_achieve_goal">%s的紅包</string>
     <string name="red_too_bad">很遺憾</string>
     <string name="red_too_bad2">與紅包擦肩而過</string>
     <string name="check_out_your_luck">查看大家手氣</string>
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());
     }
 }