yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6.4.4_fix_wish'

Browse Source 
# Conflicts:
#	config.gradle
This commit is contained in:
zlzw 2022-11-01 11:28:38 +08:00
commit a2fef0990a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1405,7 +1405,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
wishListLayout.setVisibility(View.GONE); wishListLayout.setVisibility(View.GONE);
} }
((Activity) mContext).runOnUiThread(() -> { ((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++) { for (int i = 0; i < wishlist.size(); i++) {
View wish = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null); View wish = LayoutInflater.from(mContext).inflate(R.layout.view_wish_list, null);
wish.setTag(wishlist.get(i).getId()); wish.setTag(wishlist.get(i).getId());

2
live/src/main/res/layout/view_live_room.xml
View File

@ -372,7 +372,7 @@
android:src="@mipmap/live_icon_wishlist" /> android:src="@mipmap/live_icon_wishlist" />
<ViewFlipper <ViewFlipper
android:id="@+id/wish_list" android:id="@+id/wish_list_vf"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"