yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 测试反馈内容

Browse Source
This commit is contained in:
zlzw 2024-07-18 18:16:34 +08:00
parent 092d4cb914
commit 1cde41f2d0
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab1Fragment.java
View File

@ -151,7 +151,8 @@ public class GiftWallMainTab1Fragment extends BaseFragment {
bean.getIlluminate_data().getGift_num() bean.getIlluminate_data().getGift_num()
)); ));
if (bean.getIlluminate_data().getWeek_star_data() != null) { 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_start_date(),
bean.getIlluminate_data().getGift_hall_end_date())); bean.getIlluminate_data().getGift_hall_end_date()));
} }

4
common/src/main/java/com/yunbao/common/fragment/GiftWallMainTab2Fragment.java
View File

@ -24,6 +24,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake; import com.yunbao.common.views.weight.ViewClicksAntiShake;
import java.util.Iterator; import java.util.Iterator;
@ -238,7 +239,8 @@ public class GiftWallMainTab2Fragment extends BaseFragment {
void initData(GiftWallTab2Bean bean) { void initData(GiftWallTab2Bean bean) {
list1Adapter.setList(bean.getIlluminateData().getWeekStartData()); list1Adapter.setList(bean.getIlluminateData().getWeekStartData());
list2Adapter.setList(bean.getIlluminateData().getGiftData()); 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_start_date(),
bean.getGift_hall_end_date())); bean.getGift_hall_end_date()));
} }

2
common/src/main/res/values-zh/strings.xml
View File

@ -1538,4 +1538,6 @@
<string name="dialog_gift_wall_assistance_wait">等待助力</string> <string name="dialog_gift_wall_assistance_wait">等待助力</string>
<string name="dialog_gift_wall_assistance_user">助力用户</string> <string name="dialog_gift_wall_assistance_user">助力用户</string>
<string name="dialog_gift_wall_assistance_star">助力值</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> </resources>

2
common/src/main/res/values/strings.xml
View File

@ -1544,6 +1544,8 @@
<string name="live_guard_buy_coupon_tips_cancel">Not use</string> <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_user">Assist users</string>
<string name="dialog_gift_wall_assistance_star">Value</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> <string name="sub_admission_fee">*10% of the threshold will be charged as ticket</string>
</resources> </resources>