diff --git a/app/build.gradle b/app/build.gradle index 1961f79..3be7ba7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 123 + versionCode 124 versionName "1.23.0" } 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 6004f3f..b4c12ae 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 @@ -1584,7 +1584,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB private fun donation(can: Int, message: String, isSecret: Boolean) { val rawMessage = if (isSecret) { - "${can}캔으로 비밀미션을 보냈습니다.\uD83D\uDCB0\uD83E\uDE99" + "${can}캔으로 비밀미션을 보냈습니다." } else { "${can}캔을 후원하셨습니다.\uD83D\uDCB0\uD83E\uDE99" } @@ -1617,6 +1617,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB viewModel.getUserProfileUrl(SharedPreferenceManager.userId.toInt()) chatAdapter.items.add( LiveRoomDonationChat( + memberId = SharedPreferenceManager.userId, profileUrl, nickname, rawMessage, @@ -1639,6 +1640,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB viewModel.getUserProfileUrl(SharedPreferenceManager.userId.toInt()) chatAdapter.items.add( LiveRoomDonationChat( + memberId = SharedPreferenceManager.userId, profileUrl, nickname, rawMessage, @@ -1747,6 +1749,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB handler.post { chatAdapter.items.add( LiveRoomDonationChat( + memberId = fromMember.userId.toLong(), profileUrl, nickname, rawMessage.message, @@ -2123,6 +2126,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB handler.post { chatAdapter.items.add( LiveRoomDonationChat( + memberId = peerId.toLong(), profileUrl, nickname, message.message, 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 7b1307e..8a694b3 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 @@ -248,11 +248,12 @@ data class LiveRoomNormalChat( @Keep data class LiveRoomDonationChat( + @SerializedName("memberId") val memberId: Long, @SerializedName("profileUrl") val profileUrl: String, @SerializedName("nickname") val nickname: String, @SerializedName("chat") val chat: String, @SerializedName("can") val can: Int, - @SerializedName("donationMessage") val donationMessage: String, + @SerializedName("donationMessage") val donationMessage: String ) : LiveRoomChat() { @SuppressLint("SetTextI18n") override fun bind(context: Context, binding: ViewBinding, onClickProfile: ((Long) -> Unit)?) { @@ -310,7 +311,11 @@ data class LiveRoomDonationChat( if (spChat.contains("비밀")) { itemBinding.root.setBackgroundResource( - R.drawable.bg_round_corner_6_7_cc333333 + if (memberId == SharedPreferenceManager.userId) { + R.drawable.bg_round_corner_6_7_cc59548f + } else { + R.drawable.bg_round_corner_6_7_cc333333 + } ) } else { itemBinding.root.setBackgroundResource(