From 574d93d6085fbf73b7fb56bc87bc4dedd4e563e8 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Mon, 31 Oct 2022 09:41:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E6=94=AF=E5=88=9B=E5=BB=BA?=
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 7c52b7719..004687049 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 301,
+            versionCode      : 302,
             versionName      : "6.4.4"
     ]
     manifestPlaceholders = [

From 9e411ecd71a7a4fd305ba6a85587588d1ef69b93 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 1 Nov 2022 11:26:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=81=E7=A4=BC?=
 =?UTF-8?q?=E4=B8=BB=E6=92=AD=E4=BC=9A=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E5=BF=83=E6=84=BF=E5=8D=95id=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java | 2 +-
 live/src/main/res/layout/view_live_room.xml                     | 2 +-
 2 files changed, 2 insertions(+), 2 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 f667d1f5b..1b8fb54f7 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1405,7 +1405,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             wishListLayout.setVisibility(View.GONE);
         }
         ((Activity) mContext).runOnUiThread(() -> {
-            wishListFlipper = (ViewFlipper) findViewById(R.id.wish_list);
+            wishListFlipper = (ViewFlipper) findViewById(R.id.wish_list_vf);
             for (int i = 0; i < wishlist.size(); i++) {
                 View wish = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
                 wish.setTag(wishlist.get(i).getId());
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 8d27fe65f..cf6805f4f 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -372,7 +372,7 @@
             android:src="@mipmap/live_icon_wishlist" />
 
         <ViewFlipper
-            android:id="@+id/wish_list"
+            android:id="@+id/wish_list_vf"
             android:layout_width="wrap_content"
             android:layout_height="20dp"
             android:layout_marginStart="6dp"