From 849677e50e1b30a02fe3857af0da44b3b39b0942 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Sat, 1 Apr 2023 14:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E6=84=BF=E5=8D=95=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E9=97=B4=E8=BD=AE=E6=92=AD=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/bean/BannerBean.java    |  80 +++++++++++++++++-
 .../yunbao/common/bean/EnterRoomNewModel.java |  11 +++
 .../main/res/drawable/bg_live_wish_top.xml    |   5 ++
 common/src/main/res/values/strings.xml        |   1 +
 .../yunbao/live/views/LiveRoomViewHolder.java |  56 +++++++++++-
 .../live/views/PortraitLiveManager.java       |   3 +-
 .../live/views/TopBannerCustomViewHolder.java |  15 ++--
 .../res/layout/view_live_top_banner_wish.xml  |  48 +++++++++++
 live/src/main/res/mipmap-xxxhdpi/bg_xyd.png   | Bin 0 -> 6614 bytes
 .../views/AbsMainListChildViewHolder.java     |   2 +-
 10 files changed, 207 insertions(+), 14 deletions(-)
 create mode 100644 common/src/main/res/drawable/bg_live_wish_top.xml
 create mode 100644 live/src/main/res/layout/view_live_top_banner_wish.xml
 create mode 100644 live/src/main/res/mipmap-xxxhdpi/bg_xyd.png

diff --git a/common/src/main/java/com/yunbao/common/bean/BannerBean.java b/common/src/main/java/com/yunbao/common/bean/BannerBean.java
index 75a8fc7ea..7eab80175 100644
--- a/common/src/main/java/com/yunbao/common/bean/BannerBean.java
+++ b/common/src/main/java/com/yunbao/common/bean/BannerBean.java
@@ -1,6 +1,7 @@
 package com.yunbao.common.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;
 
 /**
  * Created by cxf on 2019/3/30.
@@ -15,8 +16,80 @@ public class BannerBean {
     private String mIntoUrl;
     private int type;
     private String name;
-    private int activityId=0;
+    private int activityId = 0;
     private int mIconRes;
+    //心愿单展示数据
+    @SerializedName("wishlist_icon")
+    private String wishlistIcon;
+    @SerializedName("wishlist_num")
+    private String wishlistNum;
+    @SerializedName("wishlist_progress")
+    private String wishlistProgress;
+    @SerializedName("wishlist_name")
+    private String wishlistName;
+
+    public String getmImageUrl() {
+        return mImageUrl;
+    }
+
+    public BannerBean setmImageUrl(String mImageUrl) {
+        this.mImageUrl = mImageUrl;
+        return this;
+    }
+
+    public String getmLink() {
+        return mLink;
+    }
+
+    public BannerBean setmLink(String mLink) {
+        this.mLink = mLink;
+        return this;
+    }
+
+    public int getmIconRes() {
+        return mIconRes;
+    }
+
+    public BannerBean setmIconRes(int mIconRes) {
+        this.mIconRes = mIconRes;
+        return this;
+    }
+
+    public String getWishlistIcon() {
+        return wishlistIcon;
+    }
+
+    public BannerBean setWishlistIcon(String wishlistIcon) {
+        this.wishlistIcon = wishlistIcon;
+        return this;
+    }
+
+    public String getWishlistNum() {
+        return wishlistNum;
+    }
+
+    public BannerBean setWishlistNum(String wishlistNum) {
+        this.wishlistNum = wishlistNum;
+        return this;
+    }
+
+    public String getWishlistProgress() {
+        return wishlistProgress;
+    }
+
+    public BannerBean setWishlistProgress(String wishlistProgress) {
+        this.wishlistProgress = wishlistProgress;
+        return this;
+    }
+
+    public String getWishlistName() {
+        return wishlistName;
+    }
+
+    public BannerBean setWishlistName(String wishlistName) {
+        this.wishlistName = wishlistName;
+        return this;
+    }
 
     private StarChallengeStatusModel model;
 
@@ -80,22 +153,27 @@ public class BannerBean {
     public int getType() {
         return type;
     }
+
     @JSONField(name = "type")
     public void setType(int type) {
         this.type = type;
     }
+
     @JSONField(name = "name")
     public String getName() {
         return name;
     }
+
     @JSONField(name = "name")
     public void setName(String name) {
         this.name = name;
     }
+
     @JSONField(name = "active_id")
     public int getActivityId() {
         return activityId;
     }
+
     @JSONField(name = "active_id")
     public void setActivityId(int activityId) {
         this.activityId = activityId;
diff --git a/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java b/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java
index e0228b8d0..9e9b84a10 100644
--- a/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java
+++ b/common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java
@@ -30,6 +30,17 @@ public class EnterRoomNewModel extends BaseModel {
     private List<LiveRoomActivityModel> liveRoomActivityModels = new ArrayList<>();//活动列表
     @SerializedName("clarityType")
     private int clarityType;
+    @SerializedName("wishListProgress")
+    private WishModel wishListProgress;
+
+    public WishModel getWishListProgress() {
+        return wishListProgress;
+    }
+
+    public EnterRoomNewModel setWishListProgress(WishModel wishListProgress) {
+        this.wishListProgress = wishListProgress;
+        return this;
+    }
 
     public List<LiveRoomActivityModel> getLiveRoomActivityModels() {
         return liveRoomActivityModels;
diff --git a/common/src/main/res/drawable/bg_live_wish_top.xml b/common/src/main/res/drawable/bg_live_wish_top.xml
new file mode 100644
index 000000000..5fb4ea684
--- /dev/null
+++ b/common/src/main/res/drawable/bg_live_wish_top.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="5dp" />
+    <solid android:color="#50000000" />
+</shape>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 3d5889f67..f46917ebe 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1112,5 +1112,6 @@
     <string name="live_use_discount_content">您有一張%s，是否使用？使用後開通花費鉆石%s，返還金豆%s</string>
     <string name="live_use_discount_no">不使用</string>
     <string name="live_use_discount_yes">使用</string>
+    <string name="live_use_wish">心願</string>
 
 </resources>
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 fdeca7838..d76e5c309 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -44,7 +44,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.blankj.utilcode.util.SizeUtils;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
@@ -87,6 +86,7 @@ import com.yunbao.common.bean.RewardAllModel;
 import com.yunbao.common.bean.StarChallengeStatusModel;
 import com.yunbao.common.bean.TaskModel;
 import com.yunbao.common.bean.UserBean;
+import com.yunbao.common.bean.WishModel;
 import com.yunbao.common.event.AnchorInfoEvent;
 import com.yunbao.common.event.CustomFullServiceNotifyEvent;
 import com.yunbao.common.glide.ImgLoader;
@@ -1918,7 +1918,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
                     @Override
                     public void onError(String error) {
-                        ToastUtil.show( R.string.net_error);
+                        ToastUtil.show(R.string.net_error);
                     }
                 });
 
@@ -4401,6 +4401,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         });
         enterRoomLeave.startAnimation(animationSet1);
     }
+
     LiveAnchorSayModel sayModel;
 
     public void initAnchorSayData() {
@@ -4455,7 +4456,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         initAnchorSayData();
     }
 
-    public void hideAnchorSayAndCallAnchor(){
+    public void hideAnchorSayAndCallAnchor() {
         mAnchorSay.setX((float) mAnchorSayImage.getTag());
         mAnchorSayImage.setTag(null);
         mAnchorSayImage.setVisibility(View.VISIBLE);
@@ -4463,7 +4464,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_show);
         topBanner1.setVisibility(View.GONE);
     }
-    public void showAnchorSayAndCallAnchor(){
+
+    public void showAnchorSayAndCallAnchor() {
         mAnchorSayImage.setTag(mAnchorSay.getX());
         mAnchorSay.setX(-DpUtil.dp2px(45));
         mAnchorSayImage.setVisibility(View.INVISIBLE);
@@ -4471,6 +4473,26 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mAnchorSayHide.setImageResource(R.mipmap.ic_live_anchor_say_hide);
         topBanner1.setVisibility(View.VISIBLE);
     }
+
+    public void updateTopBanner(WishModel wishListProgress) {
+        if (mTopBannerList == null) {
+            mTopBannerList = new ArrayList<>();
+        }
+        topBanner1.setVisibility(View.VISIBLE);
+        BannerBean bannerBean = new BannerBean();
+        bannerBean.setWishlistIcon(wishListProgress.getWishlistIcon())
+                .setWishlistName(wishListProgress.getWishlistName())
+                .setWishlistNum(wishListProgress.getWishlistNum())
+                .setWishlistProgress(wishListProgress.getWishlistProgress())
+                .setmLink(CommonAppConfig.HOST + "/index.php")
+                .setType(1)
+
+        ;
+        bannerBean.setShow_type("2");
+        mTopBannerList.add(bannerBean);
+        topBanner1.update(mTopBannerList);
+    }
+
     public void initTopBanner() {
         checkNewLetter();
         mTopBannerList = new ArrayList<>();
@@ -4498,6 +4520,32 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                             bundle.putBoolean("isContactGift", true);
                             fragment.setArguments(bundle);
                             fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGiftDialogFragment");
+                        } else {
+                            BannerBean bean = mTopBannerList.get(position);
+                            IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
+                            String type = "";
+                            StringBuffer htmlUrl = new StringBuffer();
+                            htmlUrl.append(bean.getLink())
+                                    .append(bean.getLink().contains("?") ? "&uid=" : "?uid=")
+                                    .append(userInfo.getId())
+                                    .append("&token=")
+                                    .append(userInfo.getToken())
+                                    .append("&anchorUid=")
+                                    .append(mLiveUid)
+                                    .append("&liveUid=")
+                                    .append(mLiveUid)
+                                    .append("&t=")
+                                    .append(System.currentTimeMillis())
+                                    .append("&g=Appapi&m=Wish&a=index");
+                            if (TextUtils.equals(type, "1")) {
+                                ZhuangBanActivity.forward(mContext, htmlUrl.toString(), false);
+                            } else {
+                                Bundle bundle = new Bundle();
+                                bundle.putString("url", htmlUrl.toString());
+                                LiveHDDialogFragment fragment = new LiveHDDialogFragment();
+                                fragment.setArguments(bundle);
+                                fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
+                            }
                         }
                     }
                 })
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index fd0361d52..73a003987 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -479,7 +479,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                             mLiveRoomViewHolder.initAnchorSay();
                             //初始化顶部banner
                             mLiveRoomViewHolder.initTopBanner();
-
+                            //心愿单顶部bannner
+                            mLiveRoomViewHolder.updateTopBanner(data.getWishListProgress());
                             isattention = Integer.parseInt(data.getEnterRoomInfo().getIsattention());
                             if (isattention == 0) {
                                 if (countDownTimer != null) {
diff --git a/live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java b/live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java
index a9edba0e6..6c8e0bd17 100644
--- a/live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/TopBannerCustomViewHolder.java
@@ -5,6 +5,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.ms.banner.holder.BannerViewHolder;
 import com.opensource.svgaplayer.SVGADrawable;
@@ -24,13 +25,13 @@ public class TopBannerCustomViewHolder implements BannerViewHolder<BannerBean> {
     public View createView(Context context, int position, BannerBean data) {
         View view = null;
         if (data.getType() == TYPE_IMAGE) {
-            ImageView icon = new ImageView(context);
-            if (data.getIconRes() != 0) {
-                ImgLoader.display(context, data.getIconRes(), icon);
-            } else {
-                ImgLoader.display(context, data.getImageUrl(), icon);
-            }
-            view = icon;
+            view = LayoutInflater.from(context).inflate(R.layout.view_live_top_banner_wish, null);
+            ImageView wishlistIcon = view.findViewById(R.id.wishlist_icon);
+            TextView wishlistName = view.findViewById(R.id.wishlist_name);
+            TextView wishlistProgress = view.findViewById(R.id.wishlist_progress);
+            ImgLoader.display(context, data.getWishlistIcon(), wishlistIcon);
+            wishlistName.setText(data.getWishlistName());
+            wishlistProgress.setText(String.format("%s/%s", data.getWishlistProgress(), data.getWishlistNum()));
         } else {
             view = LayoutInflater.from(context).inflate(R.layout.view_live_top_banner_call_me, null);
             SVGAImageView svga = view.findViewById(R.id.svga);
diff --git a/live/src/main/res/layout/view_live_top_banner_wish.xml b/live/src/main/res/layout/view_live_top_banner_wish.xml
new file mode 100644
index 000000000..7f3c7a9d9
--- /dev/null
+++ b/live/src/main/res/layout/view_live_top_banner_wish.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="52dp"
+        android:layout_height="52dp"
+        android:background="@mipmap/bg_xyd">
+
+        <ImageView
+            android:id="@+id/wishlist_icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="4dp"
+            android:text="@string/live_use_wish"
+            android:textColor="@color/white"
+            android:textSize="8sp" />
+
+        <TextView
+            android:id="@+id/wishlist_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_marginBottom="5dp"
+            android:text="sjhasdjkjk"
+            android:textColor="@color/white"
+            android:textSize="8sp" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/wishlist_progress"
+        android:layout_width="52dp"
+        android:layout_height="10dp"
+        android:layout_marginTop="2dp"
+        android:background="@drawable/bg_live_wish_top"
+        android:gravity="center"
+        android:text="23/100"
+        android:textColor="@color/white"
+        android:textSize="8sp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/live/src/main/res/mipmap-xxxhdpi/bg_xyd.png b/live/src/main/res/mipmap-xxxhdpi/bg_xyd.png
new file mode 100644
index 0000000000000000000000000000000000000000..def0be8d7367746f735fff9129e4ccd50e82b7dc
GIT binary patch
literal 6614
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

literal 0
HcmV?d00001

diff --git a/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java b/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java
index 72dd7d5db..84644df8c 100644
--- a/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/AbsMainListChildViewHolder.java
@@ -94,7 +94,7 @@ public abstract class AbsMainListChildViewHolder extends AbsMainViewHolder imple
                     if (outRankHide != null) {
                         for (String hideId : outRankHide) {
                             if (i < 3) {
-                                hv.setData(list.get(i).setHide(TextUtils.equals(list.get(i).getUid(), hideId)), i);
+                                hv.setData(list.get(i).setHide(TextUtils .equals(list.get(i).getUid(), hideId)), i);
                             }
                         }
                     } else {