From f64b28af1b0c1ac12bfda4a62f24c171c63c2681 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 27 Oct 2025 18:13:07 +0900 Subject: [PATCH] =?UTF-8?q?feat(live-room):=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=9B=84=EC=9B=90=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=B1=84=ED=8C=85=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/LiveRoomActivity.kt | 13 ---- .../sodalive/live/room/chat/LiveRoomChat.kt | 70 ------------------- .../live/room/chat/LiveRoomChatRawMessage.kt | 3 - 3 files changed, 86 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt index a0fb02c3..b562ed90 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt @@ -79,7 +79,6 @@ import kr.co.vividnext.sodalive.live.room.chat.LiveRoomChatAdapter import kr.co.vividnext.sodalive.live.room.chat.LiveRoomChatRawMessage import kr.co.vividnext.sodalive.live.room.chat.LiveRoomChatRawMessageType import kr.co.vividnext.sodalive.live.room.chat.LiveRoomDonationChat -import kr.co.vividnext.sodalive.live.room.chat.LiveRoomDonationStatusChat import kr.co.vividnext.sodalive.live.room.chat.LiveRoomJoinChat import kr.co.vividnext.sodalive.live.room.chat.LiveRoomNormalChat import kr.co.vividnext.sodalive.live.room.chat.LiveRoomRouletteDonationChat @@ -1776,18 +1775,6 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } } - LiveRoomChatRawMessageType.DONATION_STATUS -> { - handler.post { - chatAdapter.items.add( - LiveRoomDonationStatusChat( - donationStatusString = rawMessage.message - ) - ) - chatAdapter.notifyDataSetChanged() - invalidateChat() - } - } - LiveRoomChatRawMessageType.TOGGLE_ROULETTE -> { activatingRouletteButton( isActiveRoulette = rawMessage.isActiveRoulette ?: false diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt index d40f0200..27414374 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt @@ -83,76 +83,6 @@ data class LiveRoomJoinChat( } } -@Keep -data class LiveRoomDonationStatusChat( - val response: GetLiveRoomDonationStatusResponse? = null, - val donationStatusString: String? = null -) : LiveRoomChat() { - override var type = LiveRoomChatType.DONATION_STATUS - override fun bind(context: Context, binding: ViewBinding, onClickProfile: ((Long) -> Unit)?) { - if (donationStatusString != null) { - (binding as ItemLiveRoomDonationStatusChatBinding) - .tvDonationList - .text = donationStatusString - } else { - (binding as ItemLiveRoomDonationStatusChatBinding) - .tvDonationList - .text = getDonationString(context) - } - } - - fun getDonationString(context: Context): String { - if (response != null) { - var donationStatusString: CharSequence = "[현재 라이브 후원현황]\n\n" - for (index in response.donationList.indices) { - val donation = response.donationList[index] - val spChars = SpannableString( - "${index + 1}. " + - if (donation.nickname.length > 10) { - "${donation.nickname.substring(0, 10)} : " - } else { - "${donation.nickname} : " - } + "(${donation.can.moneyFormat()} 캔)\n" - ) - spChars.setSpan( - ForegroundColorSpan( - ContextCompat.getColor( - context, - R.color.color_fdca2f - ) - ), - spChars.indexOf(": (") + 3, - spChars.indexOf(")"), - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE - ) - - donationStatusString = TextUtils.concat( - donationStatusString, spChars - ) - } - - donationStatusString = TextUtils.concat( - donationStatusString, - "\n-------------------------\n\n" - ) - - donationStatusString = TextUtils.concat( - donationStatusString, - "후원인원 : ${response.totalCount} 명\n" - ) - - donationStatusString = TextUtils.concat( - donationStatusString, - "후원합계 : ${response.totalCan.moneyFormat()} 캔" - ) - - return donationStatusString.toString() - } else { - return "" - } - } -} - @Keep data class LiveRoomNormalChat( @SerializedName("userId") val userId: Long, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt index 93265b1d..ab3ffcf0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChatRawMessage.kt @@ -28,9 +28,6 @@ enum class LiveRoomChatRawMessageType { @SerializedName("EDIT_ROOM_INFO") EDIT_ROOM_INFO, - @SerializedName("DONATION_STATUS") - DONATION_STATUS, - @SerializedName("TOGGLE_ROULETTE") TOGGLE_ROULETTE,