From 628250f093f8ca26bed1dfebd9fa1603a8280c88 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Fri, 16 Dec 2022 15:55:36 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=85=8D=E8=B4=B9=E7=A4=BC=E7=89=A9?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=92=8C=E9=87=91=E5=B8=81=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/avroom/fragment/BaseRoomFragment.kt | 10 ++-- .../erban/earn/activity/GoldDetailActivity.kt | 8 --- .../erban/earn/adapter/GoldDetailAdapter.kt | 2 - .../erban/earn/adapter/GoldRoomAdapter.kt | 42 +++++++++----- .../yizhuan/erban/ui/widget/GiftDialog.java | 1 + .../color_selector_white_false_f0f5f6.xml | 7 +++ .../main/res/layout/activity_gold_detail.xml | 37 ++++++++++-- app/src/main/res/layout/item_gold_detail.xml | 56 +++++++++---------- app/src/main/res/values/strings.xml | 2 + .../xchat_android_core/earn/bean/HallVo.kt | 2 + nim_uikit/res/values/strings.xml | 1 + 11 files changed, 105 insertions(+), 63 deletions(-) create mode 100644 app/src/main/res/color/color_selector_white_false_f0f5f6.xml diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt index 1fc307625..9c2d94d92 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt @@ -1204,11 +1204,13 @@ open class BaseRoomFragment?> : @Subscribe(threadMode = ThreadMode.MAIN) fun onRoomFreeGiftEvent(event: RoomFreeGiftEvent) { event.giftFreeInfo?.let { - if (roomFreeGiftDialog?.isShowing == true) { - roomFreeGiftDialog?.dismiss() + if (UIUtils.isTopActivity(context as Activity?) && isResumed) { + if (roomFreeGiftDialog?.isShowing == true) { + roomFreeGiftDialog?.dismiss() + } + roomFreeGiftDialog = RoomFreeGiftDialog(context, it) + roomFreeGiftDialog?.show() } - roomFreeGiftDialog = RoomFreeGiftDialog(context, it) - roomFreeGiftDialog?.show() } } diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt index 402049f9e..cf8fd7ba7 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt @@ -41,8 +41,6 @@ class GoldDetailActivity : BaseViewBindingActivity(), private lateinit var rvDelegate: RVDelegate - private lateinit var roomPopupWindow: PopupWindow - private var settlementList: List? = null private var hallVoList: List? = null @@ -88,12 +86,6 @@ class GoldDetailActivity : BaseViewBindingActivity(), } private fun initListener() { - binding.tvBelongRoom.setOnClickListener { -// showRoomPopup() - } -// binding.ivRoomDown.setOnClickListener { -// showRoomPopup() -// } binding.llDate.setOnClickListener { val builder = TimePickerGoldDialog.Builder() .setType(Type.YEAR_MONTH_DAY) diff --git a/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldDetailAdapter.kt b/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldDetailAdapter.kt index 5881afff7..232bedd9c 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldDetailAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldDetailAdapter.kt @@ -11,11 +11,9 @@ class GoldDetailAdapter : override fun convert(helper: BaseViewHolder, item: MemberSettlement) { helper.setText(R.id.tv_user_name, item.nick ?: "--") - .setText(R.id.tv_hall_name, item.hallName ?: "--") .setText(R.id.tv_have_exchange, item.exchangeGolds.toString()) .setText(R.id.tv_settlement, item.settlementGolds.toString()) ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_user_avatar), item.avatar) - ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_hall_avatar), item.hallAvatar) } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldRoomAdapter.kt b/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldRoomAdapter.kt index a4630e78b..57a90462e 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldRoomAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/adapter/GoldRoomAdapter.kt @@ -1,21 +1,33 @@ -package com.yizhuan.erban.earn.adapter; +package com.yizhuan.erban.earn.adapter -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.earn.bean.HallVo; +import com.chad.library.adapter.base.BaseQuickAdapter +import com.chad.library.adapter.base.BaseViewHolder +import com.yizhuan.erban.R +import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 +import com.yizhuan.xchat_android_core.earn.bean.HallVo -import org.jetbrains.annotations.NotNull; +class GoldRoomAdapter : BaseQuickAdapter(R.layout.item_gold_room) { -public class GoldRoomAdapter extends BaseQuickAdapter { + //选择的位置 + var selPosition = 0 + //临时记录上次选择的位置 + var temp =-1 - public GoldRoomAdapter() { - super(R.layout.item_gold_room_popwindow); + override fun convert(helper: BaseViewHolder, item: HallVo) { + helper.setText(R.id.tv_content, item.hallName) + ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_hall_avatar), item.ownerAvatar) + + helper.itemView.isSelected = helper.layoutPosition==selPosition + + helper.itemView.setOnClickListener { + helper.itemView.isSelected =true + //将旧的位置保存下来，用于后面把旧的位置颜色变回来 + temp = selPosition + //设置新的位置 + selPosition = helper.layoutPosition + //更新旧位置 + notifyItemChanged(temp) + } } - @Override - protected void convert(@NotNull BaseViewHolder helper, HallVo item) { - helper.setText(R.id.tv_content, item.getHallName()); - } - -} +} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index 454ad8b98..651f23ec9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -572,6 +572,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene GiftInfo giftInfo = giftInfoVm.data; sendGiftButton.setEnabled(true); switch (giftInfo.getConsumeType()) { + case GiftInfo.CONSUME_TYPE_FREE_GIFT: case GiftInfo.CONSUME_TYPE_GOLD: setTvGoldText(); break; diff --git a/app/src/main/res/color/color_selector_white_false_f0f5f6.xml b/app/src/main/res/color/color_selector_white_false_f0f5f6.xml new file mode 100644 index 000000000..71ab46952 --- /dev/null +++ b/app/src/main/res/color/color_selector_white_false_f0f5f6.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_gold_detail.xml b/app/src/main/res/layout/activity_gold_detail.xml index a450abe68..7588cb079 100644 --- a/app/src/main/res/layout/activity_gold_detail.xml +++ b/app/src/main/res/layout/activity_gold_detail.xml @@ -174,17 +174,44 @@ - + android:layout_weight="8"> + + + + + + diff --git a/app/src/main/res/layout/item_gold_detail.xml b/app/src/main/res/layout/item_gold_detail.xml index 600cdcedf..d5802cb68 100644 --- a/app/src/main/res/layout/item_gold_detail.xml +++ b/app/src/main/res/layout/item_gold_detail.xml @@ -2,9 +2,9 @@ - - + app:layout_constraintTop_toTopOf="@+id/iv_user_avatar" + tools:text="1,000,000,000" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb7677c14..c64ed2709 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5015,5 +5015,7 @@ 今天觀看直播滿%s啦,送你一個禮物 每天觀看直播達到特定時長,即可獲得一個"%s",每日上限%d個,禮物當日生效 我知道啦 + 當前房間總計鑽石流水:%s鉆 + 已兌:%s \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt index d7e35b2fd..c1444890c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt @@ -6,4 +6,6 @@ import lombok.Data data class HallVo( val hallId: Long, val hallName: String, + val ownerUid: Long, + val ownerAvatar: String ) \ No newline at end of file diff --git a/nim_uikit/res/values/strings.xml b/nim_uikit/res/values/strings.xml index 4d923f257..82608d944 100644 --- a/nim_uikit/res/values/strings.xml +++ b/nim_uikit/res/values/strings.xml @@ -430,4 +430,5 @@ [機器人消息] [自定義消息] 為空或者該文件不存在! +