Merge remote-tracking branch 'origin/master'

This commit is contained in:
zlzw 2022-09-22 13:50:54 +08:00
commit e749e1a7d5
2 changed files with 4 additions and 1 deletions

View File

@ -25,7 +25,7 @@ public class MsgModel extends BaseModel {
private String nobleId = "";
@SerializedName("trumpet_msg")
private String trumpetMsg = "";
@SerializedName("anchor_id")
@SerializedName(value = "anchor_id", alternate = {"liveuid"})
private String anchorId = "";
/**

View File

@ -144,6 +144,7 @@ import pl.droidsonroids.gif.GifImageView;
import static com.yunbao.common.CommonAppContext.logger;
import static com.yunbao.common.CommonAppContext.mFirebaseAnalytics;
import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY;
/**
* Created by cxf on 2018/10/9.
@ -812,6 +813,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
LiveHDDialogFragment liveHDDialogFragment = new LiveHDDialogFragment();
liveHDDialogFragment.setArguments(bundle1);
liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
} else if (bean.getType() == RECOMMEND_CARD_NOTIFY) {
gotoLive(bean.getMsgModel().getAnchorId());
} else {
showUserDialog(bean.getId());
}