From 8aebb7c2c28793bb39c016a204ff7dfb4a62dfee Mon Sep 17 00:00:00 2001 From: max Date: Thu, 4 Jul 2024 16:38:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E5=85=AC=E8=81=8A-=E5=A4=B4=E6=9D=A1UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/avroom/headline/RoomHeadlineWidget.kt | 17 +++ .../drawable-xxhdpi/room_bg_headline.9.png | Bin 7021 -> 9189 bytes .../room_bg_headline_avatar_frame.png | Bin 0 -> 2772 bytes .../room_bg_headline_money.png | Bin 0 -> 7606 bytes .../main/res/layout/room_headline_widget.xml | 98 ++++++++++++++++-- .../public_chat_hall/bean/HeadlineBean.kt | 3 + 6 files changed, 107 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/room_bg_headline_avatar_frame.png create mode 100644 app/src/main/res/drawable-xxhdpi/room_bg_headline_money.png diff --git a/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt b/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt index ed0e08961..a192004b5 100644 --- a/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt +++ b/app/src/main/java/com/chwl/app/avroom/headline/RoomHeadlineWidget.kt @@ -2,6 +2,7 @@ package com.chwl.app.avroom.headline import android.content.Context import android.util.AttributeSet +import android.view.Gravity import android.view.LayoutInflater import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil @@ -9,12 +10,15 @@ import com.chwl.app.R import com.chwl.app.databinding.RoomHeadlineWidgetBinding import com.chwl.app.public_chat.core.ChatRoomClient import com.chwl.app.public_chat.core.ChatRoomClientManager +import com.chwl.app.ui.utils.loadAvatar import com.chwl.core.im.custom.bean.CustomAttachment import com.chwl.core.im.custom.bean.HeadlineChangedAttachment import com.chwl.core.public_chat_hall.bean.HeadlineBean import com.chwl.core.public_chat_hall.model.PublicChatModel import com.chwl.core.support.room.FrameLayoutRoomWidget import com.chwl.core.support.room.RoomView +import com.example.lib_utils.AppUtils +import com.example.lib_utils.UiUtils import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum @@ -44,6 +48,12 @@ class RoomHeadlineWidget : FrameLayoutRoomWidget { defStyleRes: Int ) : super(context, attrs, defStyleAttr, defStyleRes) + init { + if (UiUtils.isRtl(AppUtils.getApp())) { + binding.tvHeadlineContent.gravity = Gravity.RIGHT + } + } + override fun onStart(roomView: RoomView) { super.onStart(roomView) if (!isInEditMode) { @@ -92,8 +102,15 @@ class RoomHeadlineWidget : FrameLayoutRoomWidget { val content = data?.content if (data?.isValid() == true && !content.isNullOrEmpty()) { binding.tvHeadlineContent.text = content + binding.ivAvatar.loadAvatar(data.avatar) + binding.tvName.text = data.nick ?: "" + binding.tvMoney.text = data.payMoneyNum?.toString() ?: "0" this.isVisible = true } else { + binding.ivAvatar.setImageDrawable(null) + binding.tvHeadlineContent.text = "" + binding.tvName.text = "" + binding.tvMoney.text = "0" this.isVisible = false } } diff --git a/app/src/main/res/drawable-xxhdpi/room_bg_headline.9.png b/app/src/main/res/drawable-xxhdpi/room_bg_headline.9.png index 93df2c7d7c4656858c235e72aad548b96add727c..0d96451f0c8bb44244e0edfe9c23ff598b25f500 100644 GIT binary patch literal 9189 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 Cn73B| literal 7021 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 diff --git a/app/src/main/res/drawable-xxhdpi/room_bg_headline_avatar_frame.png b/app/src/main/res/drawable-xxhdpi/room_bg_headline_avatar_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..a0b0ed2d7f7f9c8c9896b7ac0447dee0b30280a9 GIT binary patch literal 2772 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 Y1zi=MYN$fjtpET307*qoM6N<$f~BE^wEzGB literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/room_headline_widget.xml b/app/src/main/res/layout/room_headline_widget.xml index f2a1e5541..d33c4cb56 100644 --- a/app/src/main/res/layout/room_headline_widget.xml +++ b/app/src/main/res/layout/room_headline_widget.xml @@ -1,18 +1,94 @@ - + - + android:background="@drawable/room_bg_headline"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/bean/HeadlineBean.kt b/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/bean/HeadlineBean.kt index 3f07e2c32..8fbda1884 100644 --- a/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/bean/HeadlineBean.kt +++ b/core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/bean/HeadlineBean.kt @@ -9,8 +9,11 @@ class HeadlineBean : Serializable { val id: Long? = null val uid: Long? = null val nick: String? = null + // 0 ζœ‰ζ•ˆ 1 θΏ‡ζœŸ val recordStatus: Int? = null + val avatar: String? = null + val payMoneyNum: Long? = null fun isValid(): Boolean { return recordStatus == 0