Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -48,6 +48,7 @@ import com.yunbao.common.bean.LinkMicUserBean;
|
||||
import com.yunbao.common.bean.LiveBean;
|
||||
import com.yunbao.common.bean.LiveGiftBean;
|
||||
import com.yunbao.common.bean.LiveUserGiftBean;
|
||||
import com.yunbao.common.bean.LiveUserMailBoxModel;
|
||||
import com.yunbao.common.bean.SlideInfoModel;
|
||||
import com.yunbao.common.bean.UserBean;
|
||||
import com.yunbao.common.dialog.EffectsSettingsDialog;
|
||||
@@ -62,6 +63,7 @@ import com.yunbao.common.http.CommonHttpConsts;
|
||||
import com.yunbao.common.http.CommonHttpUtil;
|
||||
import com.yunbao.common.http.HttpCallback;
|
||||
import com.yunbao.common.http.HttpClient;
|
||||
import com.yunbao.common.http.live.LiveNetManager;
|
||||
import com.yunbao.common.http.main.MainNetManager;
|
||||
import com.yunbao.common.interfaces.CommonCallback;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
@@ -427,6 +429,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
||||
bundle.putString(Constants.LIVE_UID, mLiveUid);
|
||||
bundle.putString(Constants.LIVE_STREAM, mStream);
|
||||
fragment.setArguments(bundle);
|
||||
fragment.setOnDismissListener(dialog -> checkMsgRed());
|
||||
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
|
||||
});
|
||||
}
|
||||
@@ -443,6 +446,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
||||
bundle.putString(Constants.LIVE_STREAM, mStream);
|
||||
bundle.putString(Constants.LIVE_WISH_GIFTID, giftId);
|
||||
fragment.setArguments(bundle);
|
||||
fragment.setOnDismissListener(dialog -> checkMsgRed());
|
||||
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
|
||||
}
|
||||
|
||||
@@ -462,6 +466,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
||||
bundle.putString("by", "1");
|
||||
}
|
||||
fragment.setArguments(bundle);
|
||||
fragment.setOnDismissListener(dialog -> checkMsgRed());
|
||||
fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
|
||||
});
|
||||
|
||||
@@ -986,6 +991,7 @@ public class LiveAudienceActivity extends LiveActivity {
|
||||
bundle.putString(Constants.LIVE_UID, mLiveUid);
|
||||
bundle.putString(Constants.LIVE_STREAM, mStream);
|
||||
liveGiftDialogFragment.setArguments(bundle);
|
||||
liveGiftDialogFragment.setOnDismissListener(dialog -> checkMsgRed());
|
||||
liveGiftDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
|
||||
break;
|
||||
case CURRENT_ACTIVITY:
|
||||
@@ -1298,12 +1304,12 @@ public class LiveAudienceActivity extends LiveActivity {
|
||||
break;
|
||||
case WISH_LIST_PROGRESS:
|
||||
if (manager != null) {
|
||||
manager.wishListProgress(event.getWishListProgress(), event.getUname(),event.getLiveType());
|
||||
manager.wishListProgress(event.getWishListProgress(), event.getUname(), event.getLiveType());
|
||||
}
|
||||
break;
|
||||
case XYD_COMPLETE:
|
||||
if (manager != null) {
|
||||
manager.showXydComplete(event.getXydCompleteModel());
|
||||
manager.showXydComplete(event.getXydCompleteModel(), event.getLiveReceiveGiftBean());
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1467,5 +1473,36 @@ public class LiveAudienceActivity extends LiveActivity {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查消息,有未读就要显示红点
|
||||
*/
|
||||
private void checkMsgRed() {
|
||||
LiveNetManager.get(mContext)
|
||||
.getContactMsg(new com.yunbao.common.http.base.HttpCallback<List<LiveUserMailBoxModel>>() {
|
||||
@Override
|
||||
public void onSuccess(List<LiveUserMailBoxModel> data) {
|
||||
Log.i(TAG, "onSuccess: " + data.size());
|
||||
for (LiveUserMailBoxModel datum : data) {
|
||||
Log.i(TAG, "for data : " + datum);
|
||||
}
|
||||
setData(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(String error) {
|
||||
Log.e(TAG, "onError: " + error);
|
||||
setData(new ArrayList<>());
|
||||
}
|
||||
|
||||
void setData(List<LiveUserMailBoxModel> data) {
|
||||
for (LiveUserMailBoxModel model : data) {
|
||||
if (model.getIsRead() == 0) {
|
||||
showMsgRed(0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
showMsgRed(-1);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.yunbao.live.adapter;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Build;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
@@ -30,6 +31,7 @@ public class LiveUserAnchorMailBoxAdapter extends RecyclerView.Adapter<LiveUserA
|
||||
private Context mContext;
|
||||
private List<LiveUserMailBoxModel> list;
|
||||
OnItemClickListener<LiveUserMailBoxModel> onItemClickListener;
|
||||
DialogInterface.OnDismissListener onWebDismissListener;
|
||||
|
||||
public LiveUserAnchorMailBoxAdapter(Context mContext) {
|
||||
this.mContext = mContext;
|
||||
@@ -49,6 +51,11 @@ public class LiveUserAnchorMailBoxAdapter extends RecyclerView.Adapter<LiveUserA
|
||||
this.onItemClickListener = onItemClickListener;
|
||||
}
|
||||
|
||||
public LiveUserAnchorMailBoxAdapter setOnWebDismissListener(DialogInterface.OnDismissListener onWebDismissListener) {
|
||||
this.onWebDismissListener = onWebDismissListener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@NonNull
|
||||
@Override
|
||||
public MailBoxViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||
@@ -129,7 +136,16 @@ public class LiveUserAnchorMailBoxAdapter extends RecyclerView.Adapter<LiveUserA
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
new LiveUserAnchorMailBoxWebInfoPopDialog(mContext, box.getAnchorName(), box.getUrl()).showDialog();
|
||||
new LiveUserAnchorMailBoxWebInfoPopDialog(mContext, box.getAnchorName(), box.getUrl())
|
||||
.setOnDismissListener(dialog -> {
|
||||
if (onWebDismissListener != null) {
|
||||
onWebDismissListener.onDismiss(dialog);
|
||||
}
|
||||
})
|
||||
.showDialog();
|
||||
if (onItemClickListener != null) {
|
||||
onItemClickListener.onItemClick(box, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.yunbao.live.dialog;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
||||
@@ -58,6 +59,7 @@ public class LiveUserAnchorMailBoxPopDialog extends AbsDialogPopupWindow {
|
||||
list.setVisibility(GONE);
|
||||
}
|
||||
});
|
||||
adapter.setOnWebDismissListener(dialog -> initData());
|
||||
initData();
|
||||
}
|
||||
|
||||
@@ -96,8 +98,8 @@ public class LiveUserAnchorMailBoxPopDialog extends AbsDialogPopupWindow {
|
||||
protected void onDismiss() {
|
||||
super.onDismiss();
|
||||
for (LiveUserMailBoxModel model : adapter.getList()) {
|
||||
if(model.getIsRead()==0){
|
||||
return;
|
||||
if (model.getIsRead() == 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
Bus.get().post(new LiveAudienceEvent()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.yunbao.live.dialog;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.os.Build;
|
||||
import android.webkit.WebSettings;
|
||||
import android.webkit.WebView;
|
||||
@@ -10,7 +11,6 @@ import android.widget.TextView;
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.lxj.xpopup.XPopup;
|
||||
import com.yunbao.common.CommonAppConfig;
|
||||
import com.yunbao.common.CommonAppContext;
|
||||
import com.yunbao.common.dialog.AbsDialogPopupWindow;
|
||||
import com.yunbao.common.event.JavascriptInterfaceEvent;
|
||||
@@ -29,6 +29,7 @@ public class LiveUserAnchorMailBoxWebInfoPopDialog extends AbsDialogPopupWindow
|
||||
|
||||
String anchorName;
|
||||
String url;
|
||||
DialogInterface.OnDismissListener dismissListener;
|
||||
|
||||
public LiveUserAnchorMailBoxWebInfoPopDialog(@NonNull Context context) {
|
||||
super(context);
|
||||
@@ -45,6 +46,11 @@ public class LiveUserAnchorMailBoxWebInfoPopDialog extends AbsDialogPopupWindow
|
||||
|
||||
}
|
||||
|
||||
public LiveUserAnchorMailBoxWebInfoPopDialog setOnDismissListener(DialogInterface.OnDismissListener dismissListener) {
|
||||
this.dismissListener = dismissListener;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int bindLayoutId() {
|
||||
return R.layout.dialog_live_user_mailbox_web;
|
||||
@@ -58,7 +64,7 @@ public class LiveUserAnchorMailBoxWebInfoPopDialog extends AbsDialogPopupWindow
|
||||
textView = findViewById(R.id.title);
|
||||
textView.setText(String.format(WordUtil.getString(R.string.live_user_mailbox_web_title), anchorName));
|
||||
mWebView.addJavascriptInterface(JavascriptInterfaceUtils.getInstance()
|
||||
.setDialogClose(true)
|
||||
.setDialogClose(true)
|
||||
.setmContext(CommonAppContext.getTopActivity(), mWebView), "androidObject");
|
||||
mWebView.getSettings().setJavaScriptEnabled(true);
|
||||
mWebView.getSettings().setDomStorageEnabled(true);
|
||||
@@ -92,6 +98,9 @@ public class LiveUserAnchorMailBoxWebInfoPopDialog extends AbsDialogPopupWindow
|
||||
public void dismiss() {
|
||||
super.dismiss();
|
||||
Bus.getOff(this);
|
||||
if(dismissListener!=null) {
|
||||
dismissListener.onDismiss(null);
|
||||
}
|
||||
}
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
|
||||
@@ -11,6 +11,7 @@ import com.yunbao.common.bean.WishModel;
|
||||
import com.yunbao.common.bean.XydCompleteModel;
|
||||
import com.yunbao.common.event.CustomFullServiceNotifyEvent;
|
||||
import com.yunbao.live.bean.LivePKUserListBean;
|
||||
import com.yunbao.live.bean.LiveReceiveGiftBean;
|
||||
import com.yunbao.live.bean.OpenParametersModel;
|
||||
|
||||
public class LiveAudienceEvent extends BaseModel {
|
||||
@@ -39,6 +40,16 @@ public class LiveAudienceEvent extends BaseModel {
|
||||
private String uname;
|
||||
private WishModel wishListProgress;
|
||||
private XydCompleteModel xydCompleteModel;
|
||||
private LiveReceiveGiftBean liveReceiveGiftBean;
|
||||
|
||||
public LiveReceiveGiftBean getLiveReceiveGiftBean() {
|
||||
return liveReceiveGiftBean;
|
||||
}
|
||||
|
||||
public LiveAudienceEvent setLiveReceiveGiftBean(LiveReceiveGiftBean liveReceiveGiftBean) {
|
||||
this.liveReceiveGiftBean = liveReceiveGiftBean;
|
||||
return this;
|
||||
}
|
||||
|
||||
public XydCompleteModel getXydCompleteModel() {
|
||||
return xydCompleteModel;
|
||||
|
||||
@@ -287,7 +287,7 @@ public class LiveGiftAnimPresenter {
|
||||
}
|
||||
|
||||
public ConcurrentLinkedQueue<LiveReceiveGiftBean> getmQueue() {
|
||||
return mQueue;
|
||||
return mGifQueue;
|
||||
}
|
||||
|
||||
private void downLoadIconGifCallback() {
|
||||
@@ -1074,7 +1074,7 @@ public class LiveGiftAnimPresenter {
|
||||
/**
|
||||
* 显示gif礼物 比如油纸伞
|
||||
*/
|
||||
private void showGifGift(final LiveReceiveGiftBean bean) {
|
||||
public void showGifGift(final LiveReceiveGiftBean bean) {
|
||||
|
||||
|
||||
String url = bean.getGifUrl();
|
||||
|
||||
@@ -4,6 +4,7 @@ import android.app.Activity;
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
@@ -109,6 +110,7 @@ public class LiveRoomCheckLivePresenter {
|
||||
|
||||
@Override
|
||||
public void onError(String error) {
|
||||
Log.e("直播间异常", "onError: "+error );
|
||||
Bus.get().post(new LiveAudienceEvent()
|
||||
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_ROOM_EXCEPTION));
|
||||
ToastUtil.show(error);
|
||||
@@ -159,6 +161,7 @@ public class LiveRoomCheckLivePresenter {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Log.e("直播间异常", "Error: "+msg );
|
||||
Bus.get().post(new LiveAudienceEvent()
|
||||
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_ROOM_EXCEPTION));
|
||||
ToastUtil.show(msg);
|
||||
|
||||
@@ -602,7 +602,8 @@ public class SocketRyClient {
|
||||
XydCompleteModel xydCompleteModel = GsonUtils.fromJson(map.toString(), XydCompleteModel.class);
|
||||
EventBus.getDefault().post(new LiveAudienceEvent()
|
||||
.setType(LiveAudienceEvent.LiveAudienceType.XYD_COMPLETE)
|
||||
.setXydCompleteModel(xydCompleteModel));
|
||||
.setXydCompleteModel(xydCompleteModel)
|
||||
.setLiveReceiveGiftBean(JSON.parseObject(map.toString(), LiveReceiveGiftBean.class)));
|
||||
break;
|
||||
case Constants.WISH_LIST_PROGRESS:
|
||||
StringBuffer conString = new StringBuffer();
|
||||
|
||||
@@ -353,7 +353,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
private ImageView mAnchorSayHide;
|
||||
//----!主播说组件---//
|
||||
private Banner topBanner1;//心愿单&联系方式
|
||||
private SVGAImageView xydSvg;
|
||||
public SVGAImageView svga_new_user_gif, svga_new_user_double, svga_new_user_follow;
|
||||
|
||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||
@@ -580,17 +579,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
}
|
||||
|
||||
|
||||
private Runnable xydCompleteRunnable = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
xydSvg.setVisibility(View.GONE);
|
||||
if (xydCompleteModels.size() > 0)
|
||||
showXydComplete(xydCompleteModels.get(0), true);
|
||||
}
|
||||
};
|
||||
List<XydCompleteModel> xydCompleteModels = new ArrayList<>();
|
||||
|
||||
public synchronized void showXydComplete(XydCompleteModel model, boolean isRunble) {
|
||||
public synchronized void showXydComplete(XydCompleteModel model, boolean isRunble, LiveReceiveGiftBean liveReceiveGiftBean) {
|
||||
|
||||
if (model.getLiveId().equals(mLiveUid)) {
|
||||
if (!isRunble) {
|
||||
@@ -598,43 +589,18 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
|
||||
bean.setContent(model.getMsg());
|
||||
bean.setUserNiceName(model.getUserName());
|
||||
bean.setAtUserName(model.getGiftname())
|
||||
bean.setAtUserName(model.getXydgiftname())
|
||||
.setLevel(model.getLevel());
|
||||
bean.setType(LiveChatBean.XYD_COMPLETE);
|
||||
mLiveChatAdapter.insertItem(bean);
|
||||
xydCompleteModels.add(model);
|
||||
}
|
||||
|
||||
if (mLiveGiftAnimPresenter != null && mLiveGiftAnimPresenter.getmQueue().size() > 0) {
|
||||
new Handler().postDelayed(xydCompleteRunnable, 1000);
|
||||
} else {
|
||||
try {
|
||||
xydSvg.setLoops(1);
|
||||
xydSvg.setVisibility(View.VISIBLE);
|
||||
new SVGAParser(Contexts).parse(new URL(model.getSvg()), new SVGAParser.ParseCompletion() {
|
||||
@Override
|
||||
public void onComplete(SVGAVideoEntity videoItem) {
|
||||
SVGADrawable drawable = new SVGADrawable(videoItem);
|
||||
xydSvg.setImageDrawable(drawable);
|
||||
|
||||
SVGAViewUtils.playEndClear(xydSvg);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError() {
|
||||
}
|
||||
|
||||
});
|
||||
} catch (MalformedURLException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if (xydCompleteModels.size() > 0) {
|
||||
xydCompleteModels.remove(0);
|
||||
new Handler().postDelayed(xydCompleteRunnable, 1000);
|
||||
}
|
||||
if (mLiveGiftAnimPresenter == null) {
|
||||
mLiveGiftAnimPresenter = new LiveGiftAnimPresenter(mContext, mContentView, mGifImageView, mSVGAImageView, mLiveGiftPrizePoolContainer, windowManager);
|
||||
}
|
||||
liveReceiveGiftBean.setGiftId(liveReceiveGiftBean.getGiftName());
|
||||
mLiveGiftAnimPresenter.showGifGift(liveReceiveGiftBean);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1422,7 +1388,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
|
||||
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, liveWksLayout, "rectangle_new.png", 1);
|
||||
new LoadDian9TuUtil().loadDian9TuAssets2(mContext, wishListLayout2, "rectangle_new.png", 1);
|
||||
xydSvg = (SVGAImageView) findViewById(R.id.xyd_svg);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1512,6 +1477,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
mPkRankTopIcon.setVisibility(View.GONE);
|
||||
mAnchorLayout.setBackgroundResource(R.drawable.bg_live_ico);
|
||||
mGoodNumberIcon.setVisibility(View.GONE);
|
||||
mAnchorSay.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1933,11 +1899,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
if (flipper.getChildCount() > 0) {
|
||||
flipper.removeAllViews();
|
||||
}
|
||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(13), DpUtil.dp2px(13));
|
||||
params.leftMargin = DpUtil.dp2px(6);
|
||||
params.rightMargin = DpUtil.dp2px(2);
|
||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(DpUtil.dp2px(44), DpUtil.dp2px(16));
|
||||
LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
|
||||
textParams.leftMargin = DpUtil.dp2px(2);
|
||||
textParams.leftMargin = DpUtil.dp2px(5);
|
||||
View hotView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
|
||||
View hourView = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
|
||||
ImageView hotPic = hotView.findViewById(R.id.wish_pic);
|
||||
@@ -4742,7 +4706,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
|
||||
.setmLink(CommonAppConfig.HOST + "/index.php")
|
||||
.setType(1);
|
||||
bannerBean.setShow_type("2");
|
||||
mTopBannerList.add(bannerBean);
|
||||
if (mTopBannerList.size() == 1 || mTopBannerList.size() == 0) {
|
||||
mTopBannerList.add(bannerBean);
|
||||
} else {
|
||||
mTopBannerList.set(1, bannerBean);
|
||||
}
|
||||
topBanner1.update(mTopBannerList);
|
||||
}
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ import com.yunbao.common.http.HttpCallback;
|
||||
import com.yunbao.common.http.HttpClient;
|
||||
import com.yunbao.common.http.live.LiveNetManager;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.utils.AppManager;
|
||||
import com.yunbao.common.utils.Bus;
|
||||
import com.yunbao.common.utils.DialogUitl;
|
||||
import com.yunbao.common.utils.MicStatusManager;
|
||||
@@ -191,6 +192,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
private String leaveStream = "", leaveGroupId = "";
|
||||
public static PortraitLiveManager portraitLiveManager;
|
||||
private WishModel wishListProgress;
|
||||
private static int waitShowTopBannerTime = 6000;
|
||||
|
||||
public PortraitLiveManager setQuitF(boolean quitF) {
|
||||
isQuitF = quitF;
|
||||
@@ -203,6 +205,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
liveImDeletUtil = new LiveImDeletUtil();
|
||||
portraitLiveManager = this;
|
||||
ininView();
|
||||
AppManager.runDebugCode(() -> waitShowTopBannerTime = 1000);
|
||||
}
|
||||
|
||||
|
||||
@@ -253,9 +256,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
public void run() {
|
||||
loading.setVisibility(View.GONE);
|
||||
enterRoomLeaveHandler.post(enterRoomLeaveRunnable);
|
||||
if (topBannerRunnable != null) {
|
||||
topBannerHandler.postDelayed(topBannerRunnable, 1000);
|
||||
if (topBannerRunnable == null || topBannerHandler == null) {
|
||||
initTopBannerHandler();
|
||||
}
|
||||
topBannerHandler.postDelayed(topBannerRunnable, waitShowTopBannerTime);
|
||||
}
|
||||
};
|
||||
private Runnable topBannerRunnable = new Runnable() {
|
||||
@@ -274,6 +278,24 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
};
|
||||
private Handler topBannerHandler = new Handler();
|
||||
|
||||
private void initTopBannerHandler() {
|
||||
topBannerHandler = new Handler();
|
||||
topBannerRunnable = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (mLiveRoomViewHolder != null) {
|
||||
//初始化顶部banner
|
||||
mLiveRoomViewHolder.initTopBanner();
|
||||
mLiveRoomViewHolder.updateTopBanner();
|
||||
topBannerHandler.removeCallbacks(topBannerRunnable);
|
||||
topBannerRunnable = null;
|
||||
topBannerHandler = null;
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized void onAdd(LiveBean data, int liveType, int liveTypeVal, int liveSdk) {
|
||||
isEnterRoom = false;
|
||||
@@ -359,7 +381,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
mLiveRoomViewHolder.resetView();
|
||||
enterRoomModel.clear();
|
||||
enterRoomLeaveHandler.removeCallbacks(enterRoomLeaveRunnable);
|
||||
topBannerHandler.removeCallbacks(topBannerRunnable);
|
||||
if (topBannerHandler != null && topBannerRunnable != null) {
|
||||
topBannerHandler.removeCallbacks(topBannerRunnable);
|
||||
}
|
||||
mLiveRoomViewHolder.setAvatar(data.getAvatar());
|
||||
mLiveRoomViewHolder.setAnchorLevel(data.getLevelAnchor());
|
||||
mLiveRoomViewHolder.setName(data.getUserNiceName());
|
||||
@@ -418,7 +442,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
mLivePlayViewHolder.setAnchorPlayModel(anchorClarityType);
|
||||
//是否热度卡加成
|
||||
liveHandler.postDelayed(() -> {
|
||||
if(mLiveRoomViewHolder==null){
|
||||
if (mLiveRoomViewHolder == null) {
|
||||
return;
|
||||
}
|
||||
mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard());
|
||||
@@ -1956,9 +1980,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
|
||||
}
|
||||
}
|
||||
|
||||
public void showXydComplete(XydCompleteModel model) {
|
||||
public void showXydComplete(XydCompleteModel model, LiveReceiveGiftBean liveReceiveGiftBean) {
|
||||
if (mLiveRoomViewHolder != null) {
|
||||
mLiveRoomViewHolder.showXydComplete(model, false);
|
||||
mLiveRoomViewHolder.showXydComplete(model, false,liveReceiveGiftBean);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -701,8 +701,8 @@
|
||||
android:layout_width="52dp"
|
||||
android:layout_height="76dp"
|
||||
android:layout_below="@+id/live_rank_pk"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginRight="5dp"
|
||||
app:delay_time="5000"
|
||||
app:indicator_height="8dp"
|
||||
@@ -1301,7 +1301,7 @@
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginBottom="-30dp"
|
||||
android:background="@color/white"
|
||||
android:visibility="visible" />
|
||||
android:visibility="invisible" />
|
||||
|
||||
|
||||
<ImageView
|
||||
@@ -2355,12 +2355,6 @@
|
||||
android:layout_marginTop="60dp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<com.opensource.svgaplayer.SVGAImageView
|
||||
android:id="@+id/xyd_svg"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="fitCenter"
|
||||
android:visibility="gone" />
|
||||
|
||||
<com.opensource.svgaplayer.SVGAImageView
|
||||
android:id="@+id/svga_new_user_gif"
|
||||
@@ -2391,4 +2385,6 @@
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginTop="80dp"
|
||||
app:autoPlay="true" />
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -7,7 +7,7 @@
|
||||
<ImageView
|
||||
android:id="@+id/imageView7"
|
||||
android:layout_width="52dp"
|
||||
android:layout_height="52dp"
|
||||
android:layout_height="56dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
@@ -35,7 +35,7 @@
|
||||
android:paddingBottom="2dp"
|
||||
android:text="@string/live_ready_anchor_call_me"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="10sp"
|
||||
android:textSize="8sp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/svga" />
|
||||
|
||||
Reference in New Issue
Block a user