From fae0d01dc242f5e121c7244937913bf43d8721be Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Wed, 2 Aug 2023 15:48:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=B2=89=E4=B8=9D=E5=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/JavascriptInterfaceUtils.java       |  15 +++++
 .../live/adapter/LiveFansGroupBuyAdapter.java |  62 ++++++++++++++++++
 .../adapter/LiveFansGroupSendGiftAdapter.java |  60 +++++++++++++++++
 .../yunbao/live/dialog/LiveFansFragment.java  |   7 ++
 .../live/dialog/LiveFansGroupBuyDialog.java   |  30 +++++++++
 .../live/dialog/LiveFansGroupInfoDialog.java  |   6 ++
 .../dialog/LiveFansGroupSendGiftDialog.java   |  13 ++++
 .../main/res/layout/dialog_fans_group_buy.xml |   8 +--
 .../res/layout/dialog_fans_group_info.xml     |  10 +++
 .../res/layout/dialog_fans_group_send.xml     |   2 +-
 .../layout/item_fans_group_package_list.xml   |  22 ++++++-
 .../ic_live_fans_group_info_colse.png         | Bin 0 -> 3219 bytes
 live/src/main/res/values-en/strings.xml       |   5 ++
 live/src/main/res/values/strings.xml          |   5 ++
 14 files changed, 237 insertions(+), 8 deletions(-)
 create mode 100644 live/src/main/java/com/yunbao/live/adapter/LiveFansGroupBuyAdapter.java
 create mode 100644 live/src/main/java/com/yunbao/live/adapter/LiveFansGroupSendGiftAdapter.java
 create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_fans_group_info_colse.png

diff --git a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
index 99d965be4..698aa8101 100644
--- a/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
+++ b/common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
@@ -547,4 +547,19 @@ public class JavascriptInterfaceUtils {
         Bus.get().post(new JavascriptInterfaceEvent()
                 .setMethod("clickLogOffAccount"));
     }
+    @JavascriptInterface
+    public void androidFansGroupBuy(String id){
+        Bus.get().post(new JavascriptInterfaceEvent()
+                .setMethod("androidFansGroupBuy").setUserId(id));
+    }
+    @JavascriptInterface
+    public void androidFansGroupPack(){
+        Bus.get().post(new JavascriptInterfaceEvent()
+                .setMethod("androidFansGroupPack"));
+    }
+    @JavascriptInterface
+    public void androidFansGroupInfo(){
+        Bus.get().post(new JavascriptInterfaceEvent()
+                .setMethod("androidFansGroupInfo"));
+    }
 }
diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveFansGroupBuyAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveFansGroupBuyAdapter.java
new file mode 100644
index 000000000..ca4af865f
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/adapter/LiveFansGroupBuyAdapter.java
@@ -0,0 +1,62 @@
+package com.yunbao.live.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.live.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveFansGroupBuyAdapter extends RecyclerView.Adapter<LiveFansGroupBuyAdapter.ViewHolder> {
+    Context mContext;
+    List<?> list=new ArrayList<>();
+
+    public LiveFansGroupBuyAdapter(Context mContext) {
+        this.mContext = mContext;
+    }
+
+    public void setList(List<?> list) {
+        this.list = list;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_fans_group_buy_list, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        private ImageView giftIcon;
+        private TextView day;
+        private TextView title;
+        private TextView introduce;
+        private ImageView diamondIcon;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            giftIcon=itemView.findViewById(R.id.giftIcon);
+            day=itemView.findViewById(R.id.day);
+            title=itemView.findViewById(R.id.title);
+            introduce=itemView.findViewById(R.id.introduce);
+            diamondIcon=itemView.findViewById(R.id.diamondIcon);
+        }
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveFansGroupSendGiftAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveFansGroupSendGiftAdapter.java
new file mode 100644
index 000000000..e88ddb3cf
--- /dev/null
+++ b/live/src/main/java/com/yunbao/live/adapter/LiveFansGroupSendGiftAdapter.java
@@ -0,0 +1,60 @@
+package com.yunbao.live.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.yunbao.live.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LiveFansGroupSendGiftAdapter extends RecyclerView.Adapter<LiveFansGroupSendGiftAdapter.ViewHolder> {
+    Context mContext;
+    List<?> list=new ArrayList<>();
+
+    public LiveFansGroupSendGiftAdapter(Context mContext) {
+        this.mContext = mContext;
+    }
+
+    public void setList(List<?> list) {
+        this.list = list;
+    }
+
+    @NonNull
+    @Override
+    public LiveFansGroupSendGiftAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new LiveFansGroupSendGiftAdapter.ViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_fans_group_package_list, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull LiveFansGroupSendGiftAdapter.ViewHolder holder, int position) {
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        private ImageView giftIcon;
+        private TextView day;
+        private TextView title;
+        private TextView send;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            giftIcon=itemView.findViewById(R.id.giftIcon);
+            day=itemView.findViewById(R.id.day);
+            title=itemView.findViewById(R.id.title);
+            send=itemView.findViewById(R.id.send);
+        }
+    }
+}
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
index 0a1d21c8f..87a1abc04 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansFragment.java
@@ -131,6 +131,13 @@ public class LiveFansFragment extends AbsDialogFragment {
                 //点击 开通粉丝勋章,打开礼物列表送礼物
                 ((LiveAudienceActivity) mContext).openGiftWindow(event.getLiveId(), "0");
                 dismiss();
+            } else if (TextUtils.equals(event.getMethod(), "androidFansGroupBuy")) {
+                String id = event.getUserId();
+                new LiveFansGroupBuyDialog(mContext).setGiftId(id).showDialog();
+            } else if (TextUtils.equals(event.getMethod(), "androidFansGroupPack")) {
+                new LiveFansGroupSendGiftDialog(mContext).showDialog();
+            } else if (TextUtils.equals(event.getMethod(), "androidFansGroupInfo")) {
+                new LiveFansGroupInfoDialog(mContext).showDialog();
             }
         }
 
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupBuyDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupBuyDialog.java
index 64097a08f..930c059f1 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupBuyDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupBuyDialog.java
@@ -1,18 +1,32 @@
 package com.yunbao.live.dialog;
 
 import android.content.Context;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.lxj.xpopup.XPopup;
 import com.yunbao.common.dialog.AbsDialogPopupWindow;
 import com.yunbao.live.R;
+import com.yunbao.live.adapter.LiveFansGroupBuyAdapter;
 
 public class LiveFansGroupBuyDialog extends AbsDialogPopupWindow {
+    private TextView anchorName;
+    private TextView buy;
+    private RecyclerView recyclerView;
+    private LiveFansGroupBuyAdapter adapter;
+    private String id;
+
     public LiveFansGroupBuyDialog(@NonNull Context context) {
         super(context);
     }
 
+    public LiveFansGroupBuyDialog setGiftId(String id) {
+        this.id=id;
+        return this;
+    }
+
     @Override
     public void buildDialog(XPopup.Builder builder) {
 
@@ -22,4 +36,20 @@ public class LiveFansGroupBuyDialog extends AbsDialogPopupWindow {
     public int bindLayoutId() {
         return R.layout.dialog_fans_group_buy;
     }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        anchorName = findViewById(R.id.anchorName);
+        buy = findViewById(R.id.buy);
+        recyclerView = findViewById(R.id.giftList);
+        adapter = new LiveFansGroupBuyAdapter(mContext);
+        recyclerView.setAdapter(adapter);
+
+        buy.setOnClickListener(v -> {
+
+        });
+    }
+
+
 }
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupInfoDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupInfoDialog.java
index ce6a67981..b2a4c22db 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupInfoDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupInfoDialog.java
@@ -22,4 +22,10 @@ public class LiveFansGroupInfoDialog extends AbsDialogPopupWindow {
     public int bindLayoutId() {
         return R.layout.dialog_fans_group_info;
     }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        findViewById(R.id.colse).setOnClickListener(v -> dismiss());
+    }
 }
diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
index f156cd57c..6350cdd5d 100644
--- a/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveFansGroupSendGiftDialog.java
@@ -3,12 +3,17 @@ package com.yunbao.live.dialog;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.lxj.xpopup.XPopup;
 import com.yunbao.common.dialog.AbsDialogPopupWindow;
 import com.yunbao.live.R;
+import com.yunbao.live.adapter.LiveFansGroupSendGiftAdapter;
 
 public class LiveFansGroupSendGiftDialog extends AbsDialogPopupWindow {
+    private RecyclerView recyclerView;
+    private LiveFansGroupSendGiftAdapter adapter;
+
     public LiveFansGroupSendGiftDialog(@NonNull Context context) {
         super(context);
     }
@@ -22,4 +27,12 @@ public class LiveFansGroupSendGiftDialog extends AbsDialogPopupWindow {
     public int bindLayoutId() {
         return R.layout.dialog_fans_group_send;
     }
+
+    @Override
+    protected void onCreate() {
+        super.onCreate();
+        recyclerView = findViewById(R.id.giftList);
+        adapter = new LiveFansGroupSendGiftAdapter(mContext);
+        recyclerView.setAdapter(adapter);
+    }
 }
diff --git a/live/src/main/res/layout/dialog_fans_group_buy.xml b/live/src/main/res/layout/dialog_fans_group_buy.xml
index 5ac4251f7..7ff9b8f82 100644
--- a/live/src/main/res/layout/dialog_fans_group_buy.xml
+++ b/live/src/main/res/layout/dialog_fans_group_buy.xml
@@ -31,7 +31,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="主播昵稱的" />
+            tools:text="主播昵稱" />
 
         <TextView
             android:id="@+id/giftName"
@@ -44,7 +44,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/anchorName"
-            tools:text="臻愛禮包" />
+            android:text="@string/live_fans_group_buy_title" />
 
         <TextView
             android:id="@+id/giftInfo"
@@ -56,7 +56,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/giftName"
-            tools:text="購買可獲得5200鑽特定禮物，同時可獲得限定資源" />
+            android:text="@string/live_fans_group_buy_info" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/giftList"
@@ -89,6 +89,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/giftList"
-            tools:text="5200鑽購買" />
+            android:text="@string/live_fans_group_buy_buy" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_fans_group_info.xml b/live/src/main/res/layout/dialog_fans_group_info.xml
index 572b142f6..33cfbeaf2 100644
--- a/live/src/main/res/layout/dialog_fans_group_info.xml
+++ b/live/src/main/res/layout/dialog_fans_group_info.xml
@@ -73,4 +73,14 @@
                 android:text="@string/live_fans_group_info2_text2" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
+
+    <ImageView
+        android:id="@+id/colse"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:src="@mipmap/ic_live_fans_group_info_colse"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/live/src/main/res/layout/dialog_fans_group_send.xml b/live/src/main/res/layout/dialog_fans_group_send.xml
index 96fbbd1f9..091c138fa 100644
--- a/live/src/main/res/layout/dialog_fans_group_send.xml
+++ b/live/src/main/res/layout/dialog_fans_group_send.xml
@@ -29,7 +29,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="當前可送出" />
+            android:text="@string/live_fans_group_send_title" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/giftList"
diff --git a/live/src/main/res/layout/item_fans_group_package_list.xml b/live/src/main/res/layout/item_fans_group_package_list.xml
index 520e40819..2a3c16b2f 100644
--- a/live/src/main/res/layout/item_fans_group_package_list.xml
+++ b/live/src/main/res/layout/item_fans_group_package_list.xml
@@ -56,7 +56,23 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
-        android:id="@+id/textView12"
+        android:id="@+id/day"
+        android:layout_width="27dp"
+        android:layout_height="12dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="4dp"
+        android:background="@mipmap/icon_fans_group_buy_dialog_day"
+        android:gravity="center"
+        android:textColor="#7059BB"
+        android:textSize="8sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="1天"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/send"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="7dp"
@@ -65,12 +81,12 @@
         android:paddingTop="4dp"
         android:paddingEnd="13dp"
         android:paddingBottom="4dp"
-        tools:text="贈送"
         android:textColor="#E6FFFFFF"
         android:textSize="12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/constraintLayout4" />
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout4"
+        android:text="@string/live_fans_group_send_sub" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_fans_group_info_colse.png b/live/src/main/res/mipmap-xhdpi/ic_live_fans_group_info_colse.png
new file mode 100644
index 0000000000000000000000000000000000000000..772f10baad3e8b8062bce45b1017ca4134a1e703
GIT binary patch
literal 3219
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
FV1kDJ4=(@!

literal 0
HcmV?d00001

diff --git a/live/src/main/res/values-en/strings.xml b/live/src/main/res/values-en/strings.xml
index f4d35b300..acd4cc037 100644
--- a/live/src/main/res/values-en/strings.xml
+++ b/live/src/main/res/values-en/strings.xml
@@ -108,4 +108,9 @@
     <string name="live_fans_group_info_title">Introduction</string>
     <string name="live_fans_group_info2_title">Rules</string>
     <string name="live_fans_follow_toast">Join the fan group and unlock exclusive gifts</string>
+    <string name="live_fans_group_send_sub">Gift</string>
+    <string name="live_fans_group_send_title">Currently Available To Send</string>
+    <string name="live_fans_group_buy_title">The Perfect GiftPack</string>
+    <string name="live_fans_group_buy_info">Purchase a %s Diamond Specific Gift And Receive ALimited Resource</string>
+    <string name="live_fans_group_buy_buy">Diamond Purchase</string>
 </resources>
\ No newline at end of file
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index ddecb9f51..b3fdc3dd2 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -106,4 +106,9 @@
     <string name="live_fans_group_info_title">禮包介紹</string>
     <string name="live_fans_group_info2_title">購買規則</string>
     <string name="live_fans_follow_toast">加入粉絲團,解鎖專屬禮物</string>
+    <string name="live_fans_group_send_sub">赠送</string>
+    <string name="live_fans_group_send_title">當前可送出</string>
+    <string name="live_fans_group_buy_title">的臻愛禮包</string>
+    <string name="live_fans_group_buy_info">購買可獲得%s鑽特定禮物，同時可獲得限定資源</string>
+    <string name="live_fans_group_buy_buy">%s鑽購買</string>
 </resources>