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

修改中英文刷新数据问题

Browse Source
This commit is contained in:
18401019693 2023-11-16 13:05:56 +08:00
parent 8c75317ddc
commit f772a64507
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1369,7 +1369,7 @@
<string name="sud_in_game_game_game_peer_user">對局用戶</string> <string name="sud_in_game_game_game_peer_user">對局用戶</string>
<string name="sud_in_game_game_game_peer_user_nodata">暫無記錄~</string> <string name="sud_in_game_game_game_peer_user_nodata">暫無記錄~</string>
<string name="sud_in_game_game_game_peer_today">今日</string> <string name="sud_in_game_game_game_peer_today">今日</string>
<string name="sud_in_game_rule_hint1">1、1. 互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string> <string name="sud_in_game_rule_hint1">1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
<string name="sud_in_game_rule_hint2">2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；</string> <string name="sud_in_game_rule_hint2">2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】，後續將會提供更多遊戲種類，敬請期待；</string>
<string name="sud_in_game_rule_hint3">3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string> <string name="sud_in_game_rule_hint3">3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string>
<string name="sud_in_game_rule_hint4">4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；</string> <string name="sud_in_game_rule_hint4">4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；</string>

47
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@ -129,7 +129,8 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
@Override @Override
public void init() { public void init() {
List<LiveClassBean> list = new LiveClassManager(mContext).getLiveClass(); List<LiveClassBean> list = new LiveClassManager(mContext).getLiveClass();
typeHot= list.get(0).getEnglish(); typeHot = list.get(0).getEnglish();
select = list.get(0).getId();
mShadow = findViewById(R.id.shadow); mShadow = findViewById(R.id.shadow);
mBtnDismiss = findViewById(R.id.btn_dismiss); mBtnDismiss = findViewById(R.id.btn_dismiss);
mBtnDismiss.setOnClickListener(new View.OnClickListener() { mBtnDismiss.setOnClickListener(new View.OnClickListener() {
@ -214,30 +215,30 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
if (info.length > 0) { if (info.length > 0) {
JSONObject obj = JSON.parseObject(info[0]); JSONObject obj = JSON.parseObject(info[0]);
mBannerList = JSON.parseArray(obj.getString("slide"), BannerBean.class); mBannerList = JSON.parseArray(obj.getString("slide"), BannerBean.class);
if (!obj.containsKey("list")) { if (!obj.containsKey("list")) {
return new_data; return new_data;
} }
List<LiveBean> old_data = JSON.parseArray(obj.getString("list"), LiveBean.class); List<LiveBean> old_data = JSON.parseArray(obj.getString("list"), LiveBean.class);
LiveBean liveModel = null; LiveBean liveModel = null;
if (old_data == null) { if (old_data == null) {
return new_data; return new_data;
} }
for (LiveBean model : old_data) { for (LiveBean model : old_data) {
//判断周星榜数据 //判断周星榜数据
if (TextUtils.equals(model.getIs_week(), "1")) { if (TextUtils.equals(model.getIs_week(), "1")) {
if (mWeekListBean != null && mWeekListBean.size() > 0) { if (mWeekListBean != null && mWeekListBean.size() > 0) {
model.setmWeekList(mWeekListBean); model.setmWeekList(mWeekListBean);
} else { } else {
liveModel = model; liveModel = model;
}
} }
} }
//满足有周星榜字段但是没有周星榜数据的删掉 }
if (liveModel != null) { //满足有周星榜字段但是没有周星榜数据的删掉
old_data.remove(liveModel); if (liveModel != null) {
} old_data.remove(liveModel);
new_data.addAll(old_data); }
new_data.addAll(old_data);
} }
return new_data; return new_data;