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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18142669586 2023-04-08 14:14:19 +08:00
commit 2b62d018b5
1 changed files with 61 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1,12 +1,10 @@
package com.yunbao.live.views; package com.yunbao.live.views;
import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY; import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY;
import static com.yunbao.live.views.LivePushRyViewHolder.btn_close;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.graphics.Outline; import android.graphics.Outline;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
@ -4234,7 +4232,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
public void wishListProgress(WishModel wishModel, String userNiceName,int level) { public void wishListProgress(WishModel wishModel, String userNiceName, int level) {
wishListProgress = null; wishListProgress = null;
WishModel model = wishModel; WishModel model = wishModel;
if (!TextUtils.isEmpty(model.getWishlistName()) || !TextUtils.isEmpty(model.getWishlistProgress())) { if (!TextUtils.isEmpty(model.getWishlistName()) || !TextUtils.isEmpty(model.getWishlistProgress())) {
@ -4243,7 +4241,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
mTopBannerList.remove(bannerBean); mTopBannerList.remove(bannerBean);
} }
} }
if (mTopBannerList.size()==0){
topBanner1.setVisibility(View.GONE);
}else {
topBanner1.update(mTopBannerList); topBanner1.update(mTopBannerList);
}
new Handler().postDelayed(new Runnable() { new Handler().postDelayed(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -4263,8 +4265,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
bean.setType(LiveChatBean.WISH_LIST_PROGRESS); bean.setType(LiveChatBean.WISH_LIST_PROGRESS);
bean.setLevel(level); bean.setLevel(level);
mLiveChatAdapter.insertItem(bean); mLiveChatAdapter.insertItem(bean);
if (mTopBannerList.size()==0){
topBanner1.setVisibility(View.GONE);
}else {
topBanner1.update(mTopBannerList); topBanner1.update(mTopBannerList);
} }
}
}, 500); }, 500);
} else { } else {
@ -4279,11 +4285,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
// bean.setAtUserName(model.getWishlistName()); // bean.setAtUserName(model.getWishlistName());
// bean.setType(LiveChatBean.WISH_LIST_PROGRESS); // bean.setType(LiveChatBean.WISH_LIST_PROGRESS);
// mLiveChatAdapter.insertItem(bean); // mLiveChatAdapter.insertItem(bean);
if (mTopBannerList.size()==0){
topBanner1.setVisibility(View.GONE);
}else {
topBanner1.update(mTopBannerList); topBanner1.update(mTopBannerList);
} }
} }
}
/** /**
* 全服通知 * 全服通知
* *
@ -4559,8 +4570,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
enterRoomLeave.setBackgroundResource(R.drawable.background_100); enterRoomLeave.setBackgroundResource(R.drawable.background_100);
enterRoomLeave2.setBackgroundResource(R.drawable.bg_100_leave); enterRoomLeave2.setBackgroundResource(R.drawable.bg_100_leave);
} }
boolean max = level > 99;
new LiveTextRender().getLiveLevelImage(mContext, model.getLevel(), true,new ImgLoader.DrawableCallback() { new LiveTextRender().getLiveLevelImage(mContext, model.getLevel(), max, new ImgLoader.DrawableCallback() {
@Override @Override
public void onLoadSuccess(Drawable drawable) { public void onLoadSuccess(Drawable drawable) {
ImgLoader.display2(mContext, drawable, imageView); ImgLoader.display2(mContext, drawable, imageView);
@ -4751,6 +4762,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
.setOnBannerClickListener(new OnBannerClickListener() { .setOnBannerClickListener(new OnBannerClickListener() {
@Override @Override
public void onBannerClick(List datas, int position) { public void onBannerClick(List datas, int position) {
if (datas.size()>0){
if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) { if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) {
Dialog loading = DialogUitl.loadingDialog(mContext); Dialog loading = DialogUitl.loadingDialog(mContext);
loading.show(); loading.show();
@ -4795,6 +4807,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
} }
} }
}
}) })
.start(); .start();
LiveNetManager.get(mContext) LiveNetManager.get(mContext)