From 1cde41f2d072b114e50233c91a7354edcf18d45f Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 18 Jul 2024 18:16:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=B5=8B=E8=AF=95=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/fragment/GiftWallMainTab1Fragment.java  | 3 ++-
 .../com/yunbao/common/fragment/GiftWallMainTab2Fragment.java  | 4 +++-
 common/src/main/res/values-zh/strings.xml                     | 2 ++
 common/src/main/res/values/strings.xml                        | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java
index 15a3a1e8e..9ded18aba 100644
--- a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java
@@ -151,7 +151,8 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
                 bean.getIlluminate_data().getGift_num()
         ));
         if (bean.getIlluminate_data().getWeek_star_data() != null) {
-            show_time.setText(String.format(Locale.getDefault(), "%s - %s",
+            show_time.setText(String.format(Locale.getDefault(), "%s%s - %s",
+                    WordUtil.getNewString(R.string.dialog_gift_wall_time_now),
                     bean.getIlluminate_data().getGift_hall_start_date(),
                     bean.getIlluminate_data().getGift_hall_end_date()));
         }
diff --git a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
index c7b2d4589..3fda7bb99 100644
--- a/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
+++ b/common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
@@ -24,6 +24,7 @@ import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.utils.DpUtil;
+import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 import java.util.Iterator;
@@ -238,7 +239,8 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
     void initData(GiftWallTab2Bean bean) {
         list1Adapter.setList(bean.getIlluminateData().getWeekStartData());
         list2Adapter.setList(bean.getIlluminateData().getGiftData());
-        show_time.setText(String.format(Locale.getDefault(), "%s - %s",
+        show_time.setText(String.format(Locale.getDefault(), "%s%s - %s",
+               WordUtil.getNewString(type==1?R.string.dialog_gift_wall_time_now:R.string.dialog_gift_wall_time_old),
                 bean.getGift_hall_start_date(),
                 bean.getGift_hall_end_date()));
     }
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 9791043a8..238933138 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1538,4 +1538,6 @@
     <string name="dialog_gift_wall_assistance_wait">等待助力</string>
     <string name="dialog_gift_wall_assistance_user">助力用户</string>
     <string name="dialog_gift_wall_assistance_star">助力值</string>
+    <string name="dialog_gift_wall_time_now">本期展館時間:</string>
+    <string name="dialog_gift_wall_time_old">上期展館時間:</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 64454fdcb..1899bdb3f 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1544,6 +1544,8 @@
     <string name="live_guard_buy_coupon_tips_cancel">Not use</string>
     <string name="dialog_gift_wall_assistance_user">Assist users</string>
     <string name="dialog_gift_wall_assistance_star">Value</string>
+    <string name="dialog_gift_wall_time_now">Current period hall:</string>
+    <string name="dialog_gift_wall_time_old">Last hall time:</string>
 
     <string name="sub_admission_fee">*10% of the threshold will be charged as ticket</string>
 </resources>