From f772a645072727cb20d8ad1c8e40bebe33920af5 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 16 Nov 2023 13:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/res/values-zh/strings.xml | 2 +- .../main/views/MainHomeLiveViewHolder.java | 47 ++++++++++--------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 055f35953..eed7b579e 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1369,7 +1369,7 @@ 對局用戶 暫無記錄~ 今日 - 1、1. 互動遊戲是PDLIVE為用戶提供的全新板塊,用戶可以在首頁【遊戲專區】或直播間內參與; + 1、互動遊戲是PDLIVE為用戶提供的全新板塊,用戶可以在首頁【遊戲專區】或直播間內參與; 2、目前已上線【五子棋】、【碰碰我最強】、【飛行棋】、【扫雷】、【飞镖达人】、【怪兽消消乐】,後續將會提供更多遊戲種類,敬請期待; 3、 用戶可自定義設定遊戲門檻,要求在100~50000金豆之間,數額必須為10的倍數; 4、 遊戲開始時將會收取參與遊戲用戶的籌碼,在遊戲結束後,將收取10%的籌碼作為門票,剩餘籌碼將全部給予勝利用戶,平局時將會扣除相應籌碼门票後返還給用戶; diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java index 3be369f55..312d0975e 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java @@ -129,7 +129,8 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement @Override public void init() { List 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); mBtnDismiss = findViewById(R.id.btn_dismiss); mBtnDismiss.setOnClickListener(new View.OnClickListener() { @@ -214,30 +215,30 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement if (info.length > 0) { JSONObject obj = JSON.parseObject(info[0]); - mBannerList = JSON.parseArray(obj.getString("slide"), BannerBean.class); - if (!obj.containsKey("list")) { - return new_data; - } - List old_data = JSON.parseArray(obj.getString("list"), LiveBean.class); - LiveBean liveModel = null; - if (old_data == null) { - return new_data; - } - for (LiveBean model : old_data) { - //判断周星榜数据 - if (TextUtils.equals(model.getIs_week(), "1")) { - if (mWeekListBean != null && mWeekListBean.size() > 0) { - model.setmWeekList(mWeekListBean); - } else { - liveModel = model; - } + mBannerList = JSON.parseArray(obj.getString("slide"), BannerBean.class); + if (!obj.containsKey("list")) { + return new_data; + } + List old_data = JSON.parseArray(obj.getString("list"), LiveBean.class); + LiveBean liveModel = null; + if (old_data == null) { + return new_data; + } + for (LiveBean model : old_data) { + //判断周星榜数据 + if (TextUtils.equals(model.getIs_week(), "1")) { + if (mWeekListBean != null && mWeekListBean.size() > 0) { + model.setmWeekList(mWeekListBean); + } else { + liveModel = model; } } - //满足有周星榜字段但是没有周星榜数据的删掉 - if (liveModel != null) { - old_data.remove(liveModel); - } - new_data.addAll(old_data); + } + //满足有周星榜字段但是没有周星榜数据的删掉 + if (liveModel != null) { + old_data.remove(liveModel); + } + new_data.addAll(old_data); } return new_data;