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 @@
等待助力
助力用户
助力值
+ 本期展館時間:
+ 上期展館時間:
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 @@
Not use
Assist users
Value
+ Current period hall:
+ Last hall time:
*10% of the threshold will be charged as ticket