Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
2b62d018b5
@ -1,12 +1,10 @@
|
||||
package com.yunbao.live.views;
|
||||
|
||||
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.Dialog;
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.Outline;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
@ -4243,7 +4241,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
mTopBannerList.remove(bannerBean);
|
||||
}
|
||||
}
|
||||
if (mTopBannerList.size()==0){
|
||||
topBanner1.setVisibility(View.GONE);
|
||||
}else {
|
||||
topBanner1.update(mTopBannerList);
|
||||
}
|
||||
new Handler().postDelayed(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
@ -4263,8 +4265,12 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
bean.setType(LiveChatBean.WISH_LIST_PROGRESS);
|
||||
bean.setLevel(level);
|
||||
mLiveChatAdapter.insertItem(bean);
|
||||
if (mTopBannerList.size()==0){
|
||||
topBanner1.setVisibility(View.GONE);
|
||||
}else {
|
||||
topBanner1.update(mTopBannerList);
|
||||
}
|
||||
}
|
||||
}, 500);
|
||||
|
||||
} else {
|
||||
@ -4279,11 +4285,16 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
// bean.setAtUserName(model.getWishlistName());
|
||||
// bean.setType(LiveChatBean.WISH_LIST_PROGRESS);
|
||||
// mLiveChatAdapter.insertItem(bean);
|
||||
if (mTopBannerList.size()==0){
|
||||
topBanner1.setVisibility(View.GONE);
|
||||
}else {
|
||||
topBanner1.update(mTopBannerList);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 全服通知
|
||||
*
|
||||
@ -4559,8 +4570,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
enterRoomLeave.setBackgroundResource(R.drawable.background_100);
|
||||
enterRoomLeave2.setBackgroundResource(R.drawable.bg_100_leave);
|
||||
}
|
||||
|
||||
new LiveTextRender().getLiveLevelImage(mContext, model.getLevel(), true,new ImgLoader.DrawableCallback() {
|
||||
boolean max = level > 99;
|
||||
new LiveTextRender().getLiveLevelImage(mContext, model.getLevel(), max, new ImgLoader.DrawableCallback() {
|
||||
@Override
|
||||
public void onLoadSuccess(Drawable drawable) {
|
||||
ImgLoader.display2(mContext, drawable, imageView);
|
||||
@ -4751,6 +4762,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
.setOnBannerClickListener(new OnBannerClickListener() {
|
||||
@Override
|
||||
public void onBannerClick(List datas, int position) {
|
||||
if (datas.size()>0){
|
||||
if (mTopBannerList.get(position).getType() == TopBannerCustomViewHolder.TYPE_CALL_ANCHOR) {
|
||||
Dialog loading = DialogUitl.loadingDialog(mContext);
|
||||
loading.show();
|
||||
@ -4795,6 +4807,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
.start();
|
||||
LiveNetManager.get(mContext)
|
||||
|
Loading…
Reference in New Issue
Block a user