Merge branch '6.4.4_fix_wish'
# Conflicts: # config.gradle
This commit is contained in:
commit
a2fef0990a
@ -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());
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user