Ver código fonte

feat: 语音房送礼

(cherry picked from commit b409ea2f4976de13310e9f4ea19833c1111560fb)
tongmengxiao 1 ano atrás
pai
commit
022aaf637a

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

@@ -4,6 +4,7 @@ data class AudioSendGiftModel(
     val giftBatch: Int,
     val giftBatch: Int,
     val giftIcon: String,
     val giftIcon: String,
     val giftNum: String,
     val giftNum: String,
+    val giftType: Int,  //1热门2豪华3幸运礼物4特殊礼物(金币礼物)5名人墙
     val group_id: String,
     val group_id: String,
     val incomeCount: String,
     val incomeCount: String,
     val isSvga: Int,
     val isSvga: Int,
@@ -22,7 +23,9 @@ data class AudioSendGiftModel(
     val giftId:String,
     val giftId:String,
     val senderLevel:Int,
     val senderLevel:Int,
     val userWealthJingyanValue:String,
     val userWealthJingyanValue:String,
-    val nextWealthNeedJingyan:String
+    val nextWealthNeedJingyan:String,
+    val giftOneceNum: Int,
+    val senderAvatar:String
 )
 )
 
 
 data class Receiver(
 data class Receiver(

+ 45 - 1
room/src/main/java/com/swago/room/vm/MsgVm.kt

@@ -665,7 +665,51 @@ class MsgVm(application: Application) : AbsMsgVm(application) {
                             playSvgUrl?.invoke(imGiftModel,true)
                             playSvgUrl?.invoke(imGiftModel,true)
                         }
                         }
                         //多人送礼动画
                         //多人送礼动画
-                        addAudioGiftAnimFun?.invoke(it)
+                        if (it.giftType == 3) {
+                            val imGiftModel = IMGiftModel()
+                            imGiftModel.giftIcon = it.giftIcon
+                            imGiftModel.senderName = it.senderName
+                            val receiverName = StringBuffer()
+                            it.receivers.forEach {
+                                receiverName.append("${it.receiverName} ")
+                            }
+                            imGiftModel.receiverName = receiverName.toString()
+                            imGiftModel.giftNum = it.giftNum
+                            imGiftModel.multiple = it.multiple
+                            imGiftModel.senderId = it.senderId
+                            imGiftModel.giftId = it.giftId
+                            imGiftModel.giftOneceNum = it.giftOneceNum
+                            imGiftModel.senderAvatar = it.senderAvatar
+                            showGiftDanDao?.invoke(imGiftModel)
+                        } else {
+                            if (it.giftType == 1 || it.giftType == 5){
+                                val imGiftModel = IMGiftModel()
+                                imGiftModel.giftIcon = it.giftIcon
+                                imGiftModel.giftNum = it.giftNum
+                                imGiftModel.senderId = it.senderId
+                                imGiftModel.giftId = it.giftId
+                                imGiftModel.giftOneceNum = it.giftOneceNum
+                                imGiftModel.senderAvatar = it.senderAvatar
+
+
+                                imGiftModel.giftIdName = it.giftIdName
+                                imGiftModel.giftName = it.giftName
+                                imGiftModel.giftArName = it.giftArName
+                                imGiftModel.giftEnName = it.giftEnName
+                                imGiftModel.senderName = it.senderName
+                                imGiftModel.multiple = it.multiple
+                                val receiverName = StringBuffer()
+                                it.receivers.forEach {
+                                    receiverName.append("${it.receiverName} ")
+                                }
+                                imGiftModel.receiverName = receiverName.toString()
+
+                                waftFun?.invoke(imGiftModel)
+                            }
+
+                            addAudioGiftAnimFun?.invoke(it)
+                        }
+
                     }
                     }
                 }
                 }
             }
             }