Преглед на файлове

fix:

(cherry picked from commit 1251496bd22f4753cb173392f2fc98d139b812e2)
tongmengxiao преди 1 година
родител
ревизия
206b69307f

+ 2 - 1
baseswago/src/main/java/com/swago/baseswago/model/live/audio/AudioSendGiftModel.kt

@@ -29,7 +29,8 @@ data class AudioSendGiftModel(
     val giftOneceNum: Int,
     val senderAvatar:String,
     val im_data: ImData,
-    val isCombo: Int
+    val isCombo: Int,
+    val senderCode: String
 )
 
 data class Receiver(

+ 3 - 0
room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -764,12 +764,15 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
 
                 if (it.im_data.data.giftType == 3) { //幸运
                     val receiverName = StringBuffer()
+                    val receiverUserId =StringBuffer()
                     it.receivers.forEach {
                         receiverName.append("${it.receiverName} ,")
+                        receiverUserId.append("{${it.receiverId},}")
                     }
                     if (it.receivers.isNotEmpty())
                         receiverName.deleteCharAt(receiverName.length - 1)
                     it.im_data.data.receiverName = receiverName.toString()
+                    it.im_data.data.receiverUserId = receiverUserId.toString()
                     msgVm.showGiftDanDao?.invoke(it.im_data.data)
                 } else if (it.im_data.data.giftType == 1 || it.im_data.data.giftType == 5){ //热门和名人墙
                     val receiverName = StringBuffer()

+ 4 - 0
room/src/main/java/com/swago/room/vm/MsgVm.kt

@@ -671,8 +671,10 @@ class MsgVm(application: Application) : AbsMsgVm(application) {
                                 imGiftModel.giftIcon = it.giftIcon
                                 imGiftModel.senderName = it.senderName
                                 val receiverName = StringBuffer()
+                                val receiverUserId =StringBuffer()
                                 it.receivers.forEach {
                                     receiverName.append("${it.receiverName} ,")
+                                    receiverUserId.append("{${it.receiverId},}")
                                 }
                                 if (it.receivers.isNotEmpty())
                                     receiverName.deleteCharAt(receiverName.length - 1)
@@ -684,6 +686,8 @@ class MsgVm(application: Application) : AbsMsgVm(application) {
                                 imGiftModel.giftOneceNum = it.giftOneceNum
                                 imGiftModel.senderAvatar = it.senderAvatar
                                 imGiftModel.isCombo = it.isCombo
+                                imGiftModel.senderCode = it.senderCode
+                                imGiftModel.receiverUserId = receiverUserId
                                 showGiftDanDao?.invoke(imGiftModel)
                             } else {
                                 if (it.giftType == 1 || it.giftType == 5){