feat: 语音房自送礼物

baseswago/src/main/java/com/swago/baseswago/PersonDataDFragment.kt

@@ -68,11 +68,6 @@ class PersonDataDFragment : BaseXDFragment<DialogPersonDataBinding>() {
 
             UserInfo.getUserInfo()?.let {
                 if (it.id == uid){
-                    SwagoRoomManager.iRoomInfo?.let {
-                        if (it.getRoomType() == 2){
-                            binding.ivGift.visibility = View.GONE
-                        }
-                    }
 //                    binding.ivGift.visibility = View.GONE
                     binding.tvAt.visibility = View.GONE
                     binding.llChat.visibility = View.GONE

room/src/main/java/com/swago/room/base/BaseComFragment.kt

@@ -545,7 +545,7 @@ abstract class BaseComFragment<T : FragmentBaseComBinding> : BaseXFragment<T>(),
         msgVm.addAudioGiftAnimFun = { data ->
             if (allPositionXYList.size > 0) {
                 data.receivers.forEach {
-                    if (allPositionXYList.size>=it.maiIndex){
+                    if (allPositionXYList.size>=it.maiIndex && it.maiIndex != 0){
                         it.offSetY = allPositionXYList[it.maiIndex-1].offSetY
                         it.dx = allPositionXYList[it.maiIndex-1].dx
                         it.dy = allPositionXYList[it.maiIndex-1].dy

room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -25,6 +25,8 @@ import com.swago.baseswago.constant.ARouteConstant
 import com.swago.baseswago.constant.UrlConstant
 import com.swago.baseswago.dialog.BaseXDFragment
 import com.swago.baseswago.dialog.PayDialog
+import com.swago.baseswago.model.live.audio.AudioSeatModel
+import com.swago.baseswago.model.live.audio.MaiUserInfo
 import com.swago.baseswago.model.live.gift.GiftAllModel
 import com.swago.baseswago.model.live.gift.GiftModel
 import com.swago.baseswago.util.*
@@ -135,7 +137,18 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                         }
                         adapter.notifyItemChanged(position)
                     }
-                    getAudioMaiList()
+
+                    UserInfo.getUserInfo()?.run{
+                        if (receiveId == id){
+                            val data = ArrayList<MaiUserInfo>()
+                            data.add(MaiUserInfo(user_head_img_url ,id ,user_name,true))
+                            selectedUserList.add(id)
+                            adapter.setNewData(data)
+                        } else {
+                            getAudioMaiList()
+                        }
+                    }
+
                     json = SpUtil.readString("audioGiftList")
                 }
             }

room/src/main/java/com/swago/room/gift/control/XSvgPlayer.kt

@@ -44,6 +44,9 @@ class XSvgPlayer : ConstraintLayout {
 
 
     fun playSvga(imGiftModel:IMGiftModel){
+       if (imGiftModel.svga.isNullOrEmpty()){
+           return
+       }
         svgaParser!!.let {
             LogUtil.d("svgPlayer","xxx--$isPlaying")
             it.decodeFromURL(URL(imGiftModel.svga),object:SVGAParser.ParseCompletion{

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

@@ -704,7 +704,7 @@ class MsgVm(application: Application) : AbsMsgVm(application) {
                                 }
                                 imGiftModel.receiverName = receiverName.toString()
 
-                                waftFun?.invoke(imGiftModel)
+                                playSvgUrl?.invoke(imGiftModel ,true)
                             }
 
                             addAudioGiftAnimFun?.invoke(it)

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/chat/layout/input/InputLayout.java

@@ -20,7 +20,11 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.swago.baseswago.constant.ARouteConstant;
+import com.swago.baseswago.constant.UrlConstant;
 import com.swago.baseswago.util.AppContext;
+import com.swago.baseswago.util.SwagoInfo;
 import com.swago.baseswago.util.UserInfo;
 import com.tencent.imsdk.v2.V2TIMCallback;
 import com.tencent.imsdk.v2.V2TIMConversation;
@@ -592,7 +596,13 @@ public class InputLayout extends InputLayoutUI implements View.OnClickListener,
                 .setPositiveButton(getContext().getString(R.string.recharge), new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-
+                        if (SwagoInfo.INSTANCE.isGooglePackage()){
+                            ARouter.getInstance().build(ARouteConstant.User.recharge).navigation();
+                        }else{
+                            ARouter.getInstance().build(ARouteConstant.Base.webView)
+                                    .withString("url", UrlConstant.INSTANCE.getTOP_UP())
+                                    .navigation();
+                        }
                     }
                 })
                 .setNegativeButton(getContext().getString(R.string.ok), new View.OnClickListener() {