klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

라이브 방 

- 비밀 미션 채팅 배경색 변경
This commit is contained in:
klaus 2024-11-12 02:35:31 +09:00
parent 3136b47838
commit 9ae34fa667
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -35,7 +35,7 @@ android {
applicationId "kr.co.vividnext.sodalive" applicationId "kr.co.vividnext.sodalive"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 123 versionCode 124
versionName "1.23.0" versionName "1.23.0"
} }

6
app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
View File

@ -1584,7 +1584,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
private fun donation(can: Int, message: String, isSecret: Boolean) { private fun donation(can: Int, message: String, isSecret: Boolean) {
val rawMessage = if (isSecret) { val rawMessage = if (isSecret) {
"${can}캔으로 비밀미션을 보냈습니다.\uD83D\uDCB0\uD83E\uDE99" "${can}캔으로 비밀미션을 보냈습니다."
} else { } else {
"${can}캔을 후원하셨습니다.\uD83D\uDCB0\uD83E\uDE99" "${can}캔을 후원하셨습니다.\uD83D\uDCB0\uD83E\uDE99"
} }
@ -1617,6 +1617,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
viewModel.getUserProfileUrl(SharedPreferenceManager.userId.toInt()) viewModel.getUserProfileUrl(SharedPreferenceManager.userId.toInt())
chatAdapter.items.add( chatAdapter.items.add(
LiveRoomDonationChat( LiveRoomDonationChat(
memberId = SharedPreferenceManager.userId,
profileUrl, profileUrl,
nickname, nickname,
rawMessage, rawMessage,
@ -1639,6 +1640,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
viewModel.getUserProfileUrl(SharedPreferenceManager.userId.toInt()) viewModel.getUserProfileUrl(SharedPreferenceManager.userId.toInt())
chatAdapter.items.add( chatAdapter.items.add(
LiveRoomDonationChat( LiveRoomDonationChat(
memberId = SharedPreferenceManager.userId,
profileUrl, profileUrl,
nickname, nickname,
rawMessage, rawMessage,
@ -1747,6 +1749,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
handler.post { handler.post {
chatAdapter.items.add( chatAdapter.items.add(
LiveRoomDonationChat( LiveRoomDonationChat(
memberId = fromMember.userId.toLong(),
profileUrl, profileUrl,
nickname, nickname,
rawMessage.message, rawMessage.message,
@ -2123,6 +2126,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
handler.post { handler.post {
chatAdapter.items.add( chatAdapter.items.add(
LiveRoomDonationChat( LiveRoomDonationChat(
memberId = peerId.toLong(),
profileUrl, profileUrl,
nickname, nickname,
message.message, message.message,

9
app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt
View File

@ -248,11 +248,12 @@ data class LiveRoomNormalChat(
@Keep @Keep
data class LiveRoomDonationChat( data class LiveRoomDonationChat(
@SerializedName("memberId") val memberId: Long,
@SerializedName("profileUrl") val profileUrl: String, @SerializedName("profileUrl") val profileUrl: String,
@SerializedName("nickname") val nickname: String, @SerializedName("nickname") val nickname: String,
@SerializedName("chat") val chat: String, @SerializedName("chat") val chat: String,
@SerializedName("can") val can: Int, @SerializedName("can") val can: Int,
@SerializedName("donationMessage") val donationMessage: String, @SerializedName("donationMessage") val donationMessage: String
) : LiveRoomChat() { ) : LiveRoomChat() {
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun bind(context: Context, binding: ViewBinding, onClickProfile: ((Long) -> Unit)?) { override fun bind(context: Context, binding: ViewBinding, onClickProfile: ((Long) -> Unit)?) {
@ -310,7 +311,11 @@ data class LiveRoomDonationChat(
if (spChat.contains("비밀")) { if (spChat.contains("비밀")) {
itemBinding.root.setBackgroundResource( 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 { } else {
itemBinding.root.setBackgroundResource( itemBinding.root.setBackgroundResource(