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

修复测试反馈问题

Browse Source
This commit is contained in:
zlzw 2024-01-25 16:38:44 +08:00
parent dc87fc7048
commit 1aa6cb8f55
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/yunbao/common/bean/LiveBattlePassRewardsBean.java
View File

@ -208,6 +208,10 @@ public class LiveBattlePassRewardsBean extends BaseModel{
", liveBattlePassTypeId=" + liveBattlePassTypeId + ", liveBattlePassTypeId=" + liveBattlePassTypeId +
", rewardName='" + rewardName + '\'' + ", rewardName='" + rewardName + '\'' +
", imageUrl='" + imageUrl + '\'' + ", imageUrl='" + imageUrl + '\'' +
", sendRewardType=" + sendRewardType +
", sendGiftType=" + sendGiftType +
", sendRewardNeedcoin='" + sendRewardNeedcoin + '\'' +
", sendRewardRestrictTime='" + sendRewardRestrictTime + '\'' +
", lock=" + lock + ", lock=" + lock +
", received=" + received + ", received=" + received +
'}'; '}';

1
main/src/main/java/com/yunbao/main/adapter/BattlePassExchangeAdapter.java
View File

@ -122,6 +122,7 @@ public class BattlePassExchangeAdapter extends RecyclerView.Adapter<BattlePassEx
} }
topMoney.setText(String.valueOf(battlePassPoints.getSendGiftNeedcoin())); topMoney.setText(String.valueOf(battlePassPoints.getSendGiftNeedcoin()));
if (battlePassPoints.getSendGiftType() == 999) { if (battlePassPoints.getSendGiftType() == 999) {
topMoneySubscript.setVisibility(View.VISIBLE);
topMoney.setText(String.format("%s%s", battlePassPoints.getRestrictTime(), WordUtil.isNewZh() ? "天" : "Days")); topMoney.setText(String.format("%s%s", battlePassPoints.getRestrictTime(), WordUtil.isNewZh() ? "天" : "Days"));
if (battlePassPoints.getRestrictTime() == 0) { if (battlePassPoints.getRestrictTime() == 0) {
topMoney.setText(WordUtil.isNewZh() ? "永久" : "Forever"); topMoney.setText(WordUtil.isNewZh() ? "永久" : "Forever");

2
main/src/main/java/com/yunbao/main/adapter/BattlePassRewardAdapter.java
View File

@ -251,6 +251,7 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
}), tab1TopMoneyIcon, tab2TopMoneyIcon, tab3TopMoneyIcon); }), tab1TopMoneyIcon, tab2TopMoneyIcon, tab3TopMoneyIcon);
getAllView(((reward, view) -> { getAllView(((reward, view) -> {
view.setText(String.valueOf(reward.getSendRewardNeedcoin())); view.setText(String.valueOf(reward.getSendRewardNeedcoin()));
((View)view.getParent()).setVisibility(View.VISIBLE);
if (reward.getSendGiftType() == 999) { if (reward.getSendGiftType() == 999) {
view.setText(reward.getSendRewardRestrictTime() + (WordUtil.isNewZh() ? "天" : "Days")); view.setText(reward.getSendRewardRestrictTime() + (WordUtil.isNewZh() ? "天" : "Days"));
if (reward.getSendRewardRestrictTime().equals("0")) { if (reward.getSendRewardRestrictTime().equals("0")) {
@ -262,6 +263,7 @@ public class BattlePassRewardAdapter extends RecyclerView.Adapter<BattlePassRewa
} }
private void getReward(LiveBattlePassRewardsBean.LiveBattlePassReward reward) { private void getReward(LiveBattlePassRewardsBean.LiveBattlePassReward reward) {
System.err.println(reward);
if (userLevel < reward.getLiveBattlePassLevel()) { if (userLevel < reward.getLiveBattlePassLevel()) {
ToastUtil.show(WordUtil.getNewString(R.string.battlepass_reward_item_lock)); ToastUtil.show(WordUtil.getNewString(R.string.battlepass_reward_item_lock));
return; return;