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

主播端心愿单问题修复

Browse Source
This commit is contained in:
ningwenqiang 2024-11-05 15:05:51 +08:00
parent a14412346f
commit 414bbd10b9
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2507,8 +2507,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
StringBuffer htmlUrl = new StringBuffer(); StringBuffer htmlUrl = new StringBuffer();
//判断是否是星级活动 //判断是否是星级活动
if (bean.isStart()) { if (bean.isStart()) {
type = bean.getModel().getType(); type = bean.getModel().getType();
htmlUrl.append(CommonAppConfig.HOST).append("/").append(bean.getModel().getActivityUrl()).append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=").append(userInfo.getUserNicename()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&uid=").append(userInfo.getId()).append("&k=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0")); htmlUrl.append(CommonAppConfig.HOST).append("/").append(bean.getModel().getActivityUrl()).append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=").append(userInfo.getUserNicename()).append("&token=").append(userInfo.getToken()).append("&anchorUid=").append(mLiveUid).append("&uid=").append(userInfo.getId()).append("&k=").append(System.currentTimeMillis()).append("&isZh=").append(((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
} else { } else {

20
live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
View File

@ -30,7 +30,6 @@ import com.ms.banner.Banner;
import com.ms.banner.BannerConfig; import com.ms.banner.BannerConfig;
import com.ms.banner.listener.OnBannerClickListener; import com.ms.banner.listener.OnBannerClickListener;
import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.HtmlConfig;
import com.yunbao.common.bean.BannerBean; import com.yunbao.common.bean.BannerBean;
import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LiveBean; import com.yunbao.common.bean.LiveBean;
@ -99,6 +98,12 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
this.drpkRoomId = drpkRoomId; this.drpkRoomId = drpkRoomId;
} }
/**
* 1、IM 收到别的主播发来的PK申请同意后显示
* 2、收到别的主播加入多人PK房间后显示
* 3、多人PK倒计时结束后显示
* */
public void showEndPkBt() { public void showEndPkBt() {
if (btn_end_pk_dr != null) { if (btn_end_pk_dr != null) {
if (btn_start_dr_pk_view.getVisibility() == View.GONE) { if (btn_start_dr_pk_view.getVisibility() == View.GONE) {
@ -301,8 +306,6 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
private void close() { private void close() {
if (isSw) { if (isSw) {
((LiveSwAnchorActivity) mContext).closeLive(); ((LiveSwAnchorActivity) mContext).closeLive();
} else {
((LiveRyAnchorActivity) mContext).closeLive();
} }
} }
@ -321,8 +324,6 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
} }
if (isSw) { if (isSw) {
((LiveSwAnchorActivity) mContext).showFunctionDialog(); ((LiveSwAnchorActivity) mContext).showFunctionDialog();
} else {
((LiveRyAnchorActivity) mContext).showFunctionDialog();
} }
} }
@ -358,8 +359,6 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
private void applyLinkMicPk() { private void applyLinkMicPk() {
if (isSw) { if (isSw) {
((LiveSwAnchorActivity) mContext).applyLinkMicPk(); ((LiveSwAnchorActivity) mContext).applyLinkMicPk();
} else {
((LiveRyAnchorActivity) mContext).applyLinkMicPk();
} }
} }
@ -451,7 +450,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
if (model != null && model.getWishlist().size() > 0) { if (model != null && model.getWishlist().size() > 0) {
BannerBean bannerModel = new BannerBean(); BannerBean bannerModel = new BannerBean();
bannerModel.setShow_type("2"); bannerModel.setShow_type("2");
bannerModel.setLink(CommonAppConfig.HOST + "/index.php"); bannerModel.setLink(CommonAppConfig.HOST + "/h5/wish/index.html");
bannerModel.setImageUrl(model.getImg()); bannerModel.setImageUrl(model.getImg());
addWishList(bannerModel); addWishList(bannerModel);
@ -626,8 +625,8 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append(WordUtil.isNewZh() ? "1" : 0); .append(WordUtil.isNewZh() ? "1" : 0);
} else { } else {
type = bean.getShow_type(); type = bean.getShow_type();
htmlUrl.append(HtmlConfig.WISHLIST_URL) htmlUrl.append(bean.getLink())
.append(HtmlConfig.WISHLIST_URL.contains("?") ? "&uid=" : "?uid=") .append(bean.getLink().contains("?") ? "&uid=" : "?uid=")
.append(userInfo.getId()) .append(userInfo.getId())
.append("&token=") .append("&token=")
.append(userInfo.getToken()) .append(userInfo.getToken())
@ -640,6 +639,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder {
.append("&g=Appapi&m=Wish&a=index").append("&isZh=") .append("&g=Appapi&m=Wish&a=index").append("&isZh=")
.append(WordUtil.isNewZh() ? "1" : 0); .append(WordUtil.isNewZh() ? "1" : 0);
} }
Log.d("NWQbanner", htmlUrl.toString());
if (TextUtils.equals(type, "1")) { if (TextUtils.equals(type, "1")) {
ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 0); ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false, 0);
} else { } else {