From c9a72dfa142072b31373af7740600208e41d4e48 Mon Sep 17 00:00:00 2001
From: Martin <13046765170@163.com>
Date: Fri, 1 Nov 2024 15:20:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E6=92=ADpk?=
 =?UTF-8?q?=EF=BC=8C=E7=A9=BA=E9=97=B2=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/live/bean/LivePkBean.java | 20 +++++++++++++++++++
 .../live/dialog/FreePkDialogFragment.java     |  6 ++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/bean/LivePkBean.java b/live/src/main/java/com/yunbao/live/bean/LivePkBean.java
index 5522c0e76..8bf4c491a 100644
--- a/live/src/main/java/com/yunbao/live/bean/LivePkBean.java
+++ b/live/src/main/java/com/yunbao/live/bean/LivePkBean.java
@@ -22,7 +22,27 @@ public class LivePkBean {
     private int levelAnchor;
     private int sex;
     private String attention;
+    private String pk_avatar_thumb;
+    private String is_shengwang;
 
+    public String getPk_avatar_thumb() {
+        if (pk_avatar_thumb == null) {
+            pk_avatar_thumb = "0";
+        }
+        return pk_avatar_thumb;
+    }
+
+    public String getIs_shengwang() {
+        return is_shengwang;
+    }
+
+    public void setIs_shengwang(String is_shengwang) {
+        this.is_shengwang = is_shengwang;
+    }
+
+    public void setPk_avatar_thumb(String pk_avatar_thumb) {
+        this.pk_avatar_thumb = pk_avatar_thumb;
+    }
     @JSONField(name = "isattention")
     public String getAttention() {
         if(StringUtil.isEmpty(attention)){
diff --git a/live/src/main/java/com/yunbao/live/dialog/FreePkDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/FreePkDialogFragment.java
index b5520e1f5..eea5e6695 100644
--- a/live/src/main/java/com/yunbao/live/dialog/FreePkDialogFragment.java
+++ b/live/src/main/java/com/yunbao/live/dialog/FreePkDialogFragment.java
@@ -343,13 +343,15 @@ public class FreePkDialogFragment extends AbsDialogFragment implements View.OnCl
                 userBean.setId(bean.getUid());
                 userBean.setUserNiceName(bean.getUserNiceName());
                 userBean.setAvatar(bean.getAvatar());
-                if(bean.getPkUid().equals("0")||bean.getDrpkStatus().equals("0")){
+                if(bean.getPk_avatar_thumb().equals("0")&&bean.getDrpkStatus().equals("0")){
                     userBean.setPk(0);
                 }else{
                     userBean.setPk(1);
                 }
                 userBean.setAttention("1");
-                list.add(userBean);
+                if("1".equals(bean.getIs_shengwang())){
+                    list.add(userBean);
+                }
             }
             return list;
         }

From addaf00adb772b318bda0b0c12a17d1225750c08 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Sat, 2 Nov 2024 09:50:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.gradle b/config.gradle
index 8c47dfd65..119f1463e 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 34,
-            versionCode      : 902,
+            versionCode      : 903,
             versionName      : "6.8.2"
     ]
     manifestPlaceholders = [