diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyMessageAdapter.kt b/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyMessageAdapter.kt index b5b7e1956..68dd141bb 100644 --- a/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyMessageAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/home/adapter/HomePartyMessageAdapter.kt @@ -1,6 +1,8 @@ package com.nnbc123.app.home.adapter +import android.view.View import android.widget.ImageView +import androidx.core.view.isVisible import com.nnbc123.app.R import com.nnbc123.app.ui.utils.load import com.nnbc123.app.ui.utils.loadAvatar @@ -14,6 +16,8 @@ import com.zhpan.bannerview.BaseViewHolder * Desc: **/ class HomePartyMessageAdapter : BaseBannerAdapter() { + + var clickListener: ((GiftServiceMsgVo) -> Unit)? = null override fun bindData( holder: BaseViewHolder, item: GiftServiceMsgVo, @@ -27,6 +31,11 @@ class HomePartyMessageAdapter : BaseBannerAdapter() { holder.findViewById(R.id.iv_avatar_send).loadAvatar(item.senderAvatar) holder.findViewById(R.id.iv_avatar_receiver).loadAvatar(item.receiverAvatar) holder.findViewById(R.id.iv_gift).load(item.giftPicUrl) + val arrowView = holder.findViewById(R.id.iv_arrow) + arrowView.isVisible = !item.isLock + arrowView.setOnClickListener { + clickListener?.invoke(item) + } } override fun getLayoutId(viewType: Int): Int { diff --git a/app/src/main/java/com/nnbc123/app/home/fragment/home/party/PartyFragment.kt b/app/src/main/java/com/nnbc123/app/home/fragment/home/party/PartyFragment.kt index 914d75aa4..a41ddac69 100644 --- a/app/src/main/java/com/nnbc123/app/home/fragment/home/party/PartyFragment.kt +++ b/app/src/main/java/com/nnbc123/app/home/fragment/home/party/PartyFragment.kt @@ -85,20 +85,18 @@ class PartyFragment : BaseBindingFragment() { private fun initHotMessage() { val adapter = HomePartyMessageAdapter() + adapter.clickListener = { + StatisticManager.Instance().onEvent( + StatisticsProtocol.EVENT_HOMEPAGE_INFORM_CLICK, + it.roomUid.toString() + ) + AVRoomActivity.start(mContext, it.roomUid) + } mBinding.hotMessage.apply { setOrientation(ViewPager2.ORIENTATION_VERTICAL) setAdapter(adapter) registerLifecycleObserver(lifecycle) setUserInputEnabled(false) - setOnPageClickListener { _, position -> - adapter.getItem(position)?.let { - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_HOMEPAGE_INFORM_CLICK, - it.roomUid.toString() - ) - AVRoomActivity.start(mContext, it.roomUid) - } - } }.create() viewModel.giftServiceLiveData.observe(viewLifecycleOwner) { if (it.isSuccess && !it.data.isNullOrEmpty()) { diff --git a/app/src/main/res/drawable-xxhdpi/home_bg_match.png b/app/src/main/res/drawable-xxhdpi/home_bg_match.png deleted file mode 100644 index ce0b45620..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/home_bg_match.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/home_bg_match.webp b/app/src/main/res/drawable-xxhdpi/home_bg_match.webp new file mode 100644 index 000000000..e9d371797 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/home_bg_match.webp differ diff --git a/app/src/main/res/layout/home_party_item_message.xml b/app/src/main/res/layout/home_party_item_message.xml index c0124a67f..23687eed9 100644 --- a/app/src/main/res/layout/home_party_item_message.xml +++ b/app/src/main/res/layout/home_party_item_message.xml @@ -104,16 +104,20 @@ app:layout_constraintEnd_toStartOf="@id/iv_arrow" app:layout_constraintStart_toEndOf="@id/iv_gift" app:layout_constraintTop_toTopOf="parent" - tools:text="x11" /> + app:layout_goneMarginEnd="@dimen/dp_12" + tools:text="x1111111111" /> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> \ No newline at end of file diff --git a/core/src/diff_src_erban/java/com/nnbc123/core/home/bean/GiftServiceMsgVo.java b/core/src/diff_src_erban/java/com/nnbc123/core/home/bean/GiftServiceMsgVo.java index d2297a603..44a7170c7 100644 --- a/core/src/diff_src_erban/java/com/nnbc123/core/home/bean/GiftServiceMsgVo.java +++ b/core/src/diff_src_erban/java/com/nnbc123/core/home/bean/GiftServiceMsgVo.java @@ -14,6 +14,15 @@ public class GiftServiceMsgVo { private String giftName; private int giftNum; private String giftPicUrl; + private boolean lock; + + public boolean isLock() { + return lock; + } + + public void setLock(boolean lock) { + this.lock = lock; + } public long getRoomUid() { return roomUid;