Merge branch 'google' into qiye

baseswago/src/main/java/com/swago/baseswago/model/live/audio/AudioSendGiftModel.kt

@@ -14,12 +14,17 @@ data class AudioSendGiftModel(
     val senderId: String,
     val senderName: String,
     val svgaUrl: String,
-    val userCoins: String
+    val userCoins: String,
+    val giftName:String,
+    val giftArName:String,
+    val giftIdName:String,
+    val giftEnName:String,
 )
 
 data class Receiver(
     val maiIndex: Int,
     val receiverId: String,
+    val receiverName:String,
     /**
      * dx,dy标识位移的距离
      */

room/src/main/java/com/swago/room/vm/MsgVm.kt

@@ -565,7 +565,17 @@ class MsgVm(application: Application) : AbsMsgVm(application) {
                         if (it.isSvga == 1){
                             val imGiftModel = IMGiftModel()
                             imGiftModel.svga = it.svgaUrl
-                            playSvgUrl?.invoke(imGiftModel,false)
+                            imGiftModel.senderName = it.senderName
+                            val stringBuffer = StringBuffer()
+                            it.receivers.forEach { receiver ->
+                                stringBuffer.append(receiver.receiverName)
+                            }
+                            imGiftModel.receiverName = stringBuffer.toString()
+                            imGiftModel.giftName = it.giftName
+                            imGiftModel.giftIdName = it.giftIdName
+                            imGiftModel.giftArName = it.giftArName
+                            imGiftModel.giftEnName = it.giftEnName
+                            playSvgUrl?.invoke(imGiftModel,true)
                         }
                         //多人送礼动画
                         addAudioGiftAnimFun?.invoke(it)