From 414bbd10b93baa1cc1e74fb1d83ece441368b76b Mon Sep 17 00:00:00 2001
From: ningwenqiang <gongduoxiang@163.com>
Date: Tue, 5 Nov 2024 15:05:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E7=AB=AF=E5=BF=83=E6=84=BF?=
 =?UTF-8?q?=E5=8D=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/views/LiveRoomViewHolder.java |  2 --
 .../live/views/LiveRyAnchorViewHolder.java    | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

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