diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt index 72dc5733c..1288e5434 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomLuckyBagDialog.kt @@ -42,6 +42,7 @@ import com.chwl.library.common.util.ClickUtils.click import com.chwl.library.common.util.doToast import com.chwl.library.common.util.isVerify import com.chwl.library.common.util.postSafe +import com.chwl.library.common.util.setAutoSizeModel import com.chwl.library.common.util.setMargin import com.chwl.library.common.util.setVis import com.chwl.library.common.util.toColor @@ -447,6 +448,9 @@ class RoomLuckyBagDialog : BaseDialogFragment() { ChargeActivity.start(context) } + binding.btnGoldBag.setAutoSizeModel() + binding.btnGiftBag.setAutoSizeModel() + tabChange(true) } @@ -660,7 +664,7 @@ class RoomLuckyBagDialog : BaseDialogFragment() { }) } } - + if (!items.isVerify()) { R.string._ver_24_sentLuckyBagNoSelect.doToast() return diff --git a/app/src/main/java/com/chwl/app/pay/adapter/GiveDiamondDetailAdapter.kt b/app/src/main/java/com/chwl/app/pay/adapter/GiveDiamondDetailAdapter.kt index 41e717f8e..d69a2ca2b 100644 --- a/app/src/main/java/com/chwl/app/pay/adapter/GiveDiamondDetailAdapter.kt +++ b/app/src/main/java/com/chwl/app/pay/adapter/GiveDiamondDetailAdapter.kt @@ -9,6 +9,7 @@ import com.chwl.app.R import com.chwl.app.ui.utils.loadAvatar import com.chwl.core.user.bean.DiamondGiveHistoryInfo import com.chwl.library.utils.TimeUtils +import com.example.lib_utils.ktx.getString class GiveDiamondDetailAdapter : @@ -18,9 +19,9 @@ class GiveDiamondDetailAdapter : override fun convert(helper: BaseViewHolder, item: DiamondGiveHistoryInfo) { helper.getView(R.id.tv_number).text = item.targetNick.toString() - helper.getView(R.id.tv_pay_diamond).text = - mContext.getString(R.string.all_pay_diamond, item.realDiamondNum.toString()) + helper.getView(R.id.tv_pay_diamond).text = item.realDiamondNum.toString() helper.setText(R.id.tv_date, TimeUtils.getDateTimeString(item.createTime,"yyyy-MM-dd HH:mm:ss")) + helper.setText(R.id.erBanNo, R.string.text_user_id.getString(item.targetErbanNo)) helper.getView(R.id.iv_avatar).loadAvatar(item.targetAvatar) } diff --git a/app/src/main/res/layout/item_give_diamond_detail.xml b/app/src/main/res/layout/item_give_diamond_detail.xml index 07a638870..e3323a218 100644 --- a/app/src/main/res/layout/item_give_diamond_detail.xml +++ b/app/src/main/res/layout/item_give_diamond_detail.xml @@ -22,15 +22,16 @@ android:layout_marginStart="10dp" android:textColor="@color/color_1F1A4E" android:textSize="14sp" + android:layout_marginBottom="3dp" android:textStyle="bold" - app:layout_constraintBottom_toTopOf="@id/tv_pay_diamond" + app:layout_constraintBottom_toTopOf="@id/erBanNo" app:layout_constraintStart_toEndOf="@id/iv_avatar" app:layout_constraintTop_toTopOf="@id/iv_avatar" app:layout_constraintVertical_chainStyle="packed" tools:text="1000" /> + tools:text="0" /> + + +