From dffe681b9507cf3bda685e517194faa0c728862f Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Mon, 23 Sep 2024 14:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B5=E6=97=8F=E5=9B=BE=E6=A0=87=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=20=E5=90=8C=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/http/LiveHttpUtil.java | 11 +++- .../live/adapter/UserMoreInfoAdapter.java | 59 ++++++++++++------- .../dialog/LiveUserMoreDialogFragment.java | 7 ++- .../yunbao/live/views/LiveRoomViewHolder.java | 1 + .../live/views/PortraitLiveManager.java | 2 +- 5 files changed, 57 insertions(+), 23 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java index 9fb13c576..46f4dc9b6 100644 --- a/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java +++ b/common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java @@ -31,19 +31,28 @@ public class LiveHttpUtil { HttpClient.getInstance().cancel(tag); } + /** * 获取当前直播间的用户列表 */ - public static void getUserList(String liveuid, String stream, String type, int p, HttpCallback callback) { + public static void getUserList(String liveuid, String stream, String type, int p,String is_noble,HttpCallback callback) { HttpClient.getInstance().get("Live.getUserLists", LiveHttpConsts.GET_USER_LIST) .params("liveuid", liveuid) .params("stream", stream) .params("type", type) .params("p", p) + .params("is_noble", is_noble) .params("version", "" + VersionUtil.getVersion()) .execute(callback); } + /** + * 获取当前直播间的用户列表 + */ + public static void getUserList(String liveuid, String stream, String type, int p, HttpCallback callback) { + getUserList(liveuid,stream,type,p,"0",callback); + } + /** * 获取直播用户日榜/周榜 * diff --git a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java index a5eff968b..949c0fa0f 100644 --- a/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java @@ -31,6 +31,7 @@ import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.CommonIconUtil; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.L; +import com.yunbao.common.utils.NobleUtil; import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.views.weight.ClipPathCircleImage; @@ -56,6 +57,8 @@ public class UserMoreInfoAdapter extends RefreshAdapter { private List outRankHide = new ArrayList<>(); private boolean noble = false; + private String TAG = "UserMoreInfoAdapter"; + public UserMoreInfoAdapter setNoble(boolean noble) { this.noble = noble; return this; @@ -160,30 +163,46 @@ public class UserMoreInfoAdapter extends RefreshAdapter { tvName.setTextSize(12); tvName.setTextColor(mContext.getResources().getColor(R.color.white)); if (type.equals("1")) { - String NobleImg= bean.getNoble_img(); - if (!TextUtils.isEmpty(NobleImg)){ - ImgLoader.display(mContext, NobleImg, mIcon); - } else if (!bean.getDress().getMedal().equals("")) { - ImgLoader.display(mContext, bean.getDress().getMedal(), mIcon); - } else { - int guardType = ((LiveUserGiftBean) bean).getGuardType(); - if (guardType == Constants.GUARD_TYPE_NONE) { - if (mIcon.getVisibility() != View.VISIBLE) { - mIcon.setVisibility(View.INVISIBLE); - } + if (noble) { + Log.i(TAG, "type:1 贵族"); + String NobleImg = bean.getNoble_img(); + if (!NobleImg.equals("")) { + ImgLoader.display(mContext, NobleImg, mIcon); } else { - if (mIcon.getVisibility() == View.INVISIBLE) { - mIcon.setVisibility(View.VISIBLE); + String vipType = bean.getNoble_id(); + if (!TextUtils.isEmpty(vipType) && !vipType.equals("0")) { + mIcon.setImageResource(NobleUtil.nobleIdToImageResId(Integer.parseInt(vipType))); } - if (guardType == Constants.GUARD_TYPE_DAY) { - mIcon.setImageDrawable(mGuardDrawable0); - } else if (guardType == Constants.GUARD_TYPE_MONTH) { - // mIcon.setImageDrawable(mGuardDrawable1); //观众列表不显示粉丝牌 - } else if (guardType == Constants.GUARD_TYPE_YEAR) { - mIcon.setImageDrawable(mGuardDrawable2); + } + } else { + Log.i(TAG, "type:1 普通观众"); + //清空mIcon的Img + mIcon.setImageBitmap(null); + if (!bean.getDress().getMedal().equals("")) { + Log.i(TAG, "getMedal:1 普通观众"); + ImgLoader.display(mContext, bean.getDress().getMedal(), mIcon); + } else { + Log.i(TAG, "getMedal:2 普通观众"); + int guardType = ((LiveUserGiftBean) bean).getGuardType(); + if (guardType == Constants.GUARD_TYPE_NONE) { + if (mIcon.getVisibility() != View.VISIBLE) { + mIcon.setVisibility(View.INVISIBLE); + } + } else { + if (mIcon.getVisibility() == View.INVISIBLE) { + mIcon.setVisibility(View.VISIBLE); + } + if (guardType == Constants.GUARD_TYPE_DAY) { + mIcon.setImageDrawable(mGuardDrawable0); + } else if (guardType == Constants.GUARD_TYPE_MONTH) { + // mIcon.setImageDrawable(mGuardDrawable1); //观众列表不显示粉丝牌 + } else if (guardType == Constants.GUARD_TYPE_YEAR) { + mIcon.setImageDrawable(mGuardDrawable2); + } } } } + } else if (type.equals("2")) { int guardType = ((LiveUserGiftBean) bean).getGuardType(); if (guardType == Constants.GUARD_TYPE_NONE) { @@ -251,7 +270,7 @@ public class UserMoreInfoAdapter extends RefreshAdapter { } else { mRanksIcon.addView(rankImage, 0); } - }else if(type.equals("6")){ + } else if (type.equals("6")) { L.e("type==6"); } diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java index 2f3294c59..730eeb7c2 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java @@ -160,6 +160,7 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie Up(); type = "guanzhong"; mRefreshView.initData(); + userMoreInfoAdapter.setNoble(false); no_more.setImageBitmap(null); } }); @@ -241,7 +242,11 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie callback.onError(); }).isDisposed(); } else { - LiveHttpUtil.getUserList(mLiveUid, stream, type, p, callback); + if(Tips=="1" && noble){ + LiveHttpUtil.getUserList(mLiveUid, stream, type, p,"1",callback); + }else { + LiveHttpUtil.getUserList(mLiveUid, stream, type, p,callback); + } pg = p; if (p == 1) { noMoreLayout.setVisibility(View.VISIBLE); diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index c74d86d05..4889f6446 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -5569,6 +5569,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis mLiveRoomHandler.removeCallbacksAndMessages(null); } + //设置快速回复 public void setFastMessage(List greetings) { fastMsgRecyclerView.setVisibility(View.VISIBLE); fastMessageRecyclerViewAdapter.setMessage(greetings); diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 24068bdc6..4a884fd96 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -628,7 +628,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe //数据设置 if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.setLiveInfo(mLiveBean.getUid(), mLiveBean.getStream(), Integer.parseInt(data.getEnterRoomInfo().getUserlistTime()) * 4000); -// mLiveRoomViewHolder.setFastMessage(greetings); + mLiveRoomViewHolder.setFastMessage(greetings); mLiveRoomViewHolder.setVotes(data.getEnterRoomInfo().getVotestotal()); //真爱排行 数量 mLiveRoomViewHolder.setMedaRankNum(data.getEnterRoomInfo().getMedalRankNum());