diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java index 39161f02e..0529ccb11 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java @@ -239,10 +239,12 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements bean.setChecked(false); } for (int i : guardBuyBean.getPrivilege()) { - mRightList.get(i).setChecked(true); + if(i= guardBuyBean.getCoin()); + // mBtnBuy.setEnabled(mCoinVal >= guardBuyBean.getCoin()); } } 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 b94c6972d..7386bc10e 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -783,11 +783,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis if (mLiveUserAdapter != null) { JSONObject obj = JSON.parseObject(info[0]); List list = JSON.parseArray(obj.getString("userlist"), LiveUserGiftBean.class); - if(list.size()>3){ - ViewGroup.LayoutParams layoutParams = mUserRecyclerView.getLayoutParams(); - layoutParams.height=DpUtil.dp2px(100); - mUserRecyclerView.setLayoutParams(layoutParams); - } mLiveUserAdapter.refreshList(list); } } @@ -1464,7 +1459,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis */ public void setUserList(List list) { if (mLiveUserAdapter != null) { - resetUserListWidth(DpUtil.dp2px((Math.min(list.size(), 3)) * 38)); + //resetUserListWidth(DpUtil.dp2px((Math.min(list.size(), 3)) * 30)); mLiveUserAdapter.refreshList(list); } } diff --git a/live/src/main/res/drawable/bg_guard_btn_buy.xml b/live/src/main/res/drawable/bg_guard_btn_buy.xml index 16efaee29..e1e59a76e 100644 --- a/live/src/main/res/drawable/bg_guard_btn_buy.xml +++ b/live/src/main/res/drawable/bg_guard_btn_buy.xml @@ -1,15 +1,9 @@ - - - - - - - - - - + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_new_guard_buy.xml b/live/src/main/res/layout/dialog_new_guard_buy.xml index 6cbf011f6..444b8e434 100644 --- a/live/src/main/res/layout/dialog_new_guard_buy.xml +++ b/live/src/main/res/layout/dialog_new_guard_buy.xml @@ -132,7 +132,7 @@ android:layout_marginTop="25dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - tools:visibility="gone"> + tools:visibility="visible"> - + android:layout_height="38dp"> - - - - - - - - + + + + + + + + + android:src="@drawable/m_chu_xia" + app:riv_oval="true" /> + app:autoPlay="true" /> @@ -46,15 +44,15 @@ android:id="@+id/icon" android:layout_width="16dp" android:layout_height="16dp" - android:layout_alignParentBottom="true" android:layout_alignParentRight="true" - android:visibility="gone"/> + android:layout_alignParentBottom="true" + android:visibility="gone" /> + android:layout_alignParentBottom="true" + android:visibility="gone" /> \ No newline at end of file diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 1f64e966d..6a6fd9045 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -181,8 +181,9 @@ android:layout_toRightOf="@id/group_1"> @@ -215,7 +216,8 @@ @@ -223,16 +225,17 @@ @@ -1861,6 +1864,7 @@