From 0f12fcf40f17db2b618c66eac2e926293dd2caba Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Thu, 2 Mar 2023 17:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=A7=E9=A9=BE=E7=BC=A9=E6=94=BE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mango/moshen/avroom/widget/RoomEffectView.kt | 8 +++-----
 app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt  | 5 +++--
 app/src/main/res/layout/layout_room_effect.xml            | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/mango/moshen/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/mango/moshen/avroom/widget/RoomEffectView.kt
index bd888ce71..0fba9e743 100644
--- a/app/src/main/java/com/mango/moshen/avroom/widget/RoomEffectView.kt
+++ b/app/src/main/java/com/mango/moshen/avroom/widget/RoomEffectView.kt
@@ -33,10 +33,6 @@ import com.mango.moshen.avroom.activity.AVRoomActivity
 import com.mango.moshen.avroom.helper.AnimHelper
 import com.mango.moshen.common.svga.SimpleSvgaCallback
 import com.mango.moshen.databinding.LayoutRoomEffectBinding
-import com.mango.moshen.ui.utils.ImageLoadUtils
-import com.mango.moshen.ui.utils.isDestroyed
-import com.mango.moshen.ui.utils.load
-import com.mango.moshen.ui.utils.loadAnim
 import com.mango.moshen.ui.widget.SimpleAnimListener
 import com.mango.moshen.ui.widget.drawgift.DrawGiftPlayHelper
 import com.mango.moshen.utils.SpannableBuilder
@@ -52,10 +48,12 @@ import com.mango.core.super_admin.util.SuperAdminUtil
 import com.mango.core.user.UserModel
 import com.mango.core.user.bean.UserInfo
 import com.mango.core.utils.subAndReplaceDot
+import com.mango.moshen.ui.utils.*
 import com.mango.moshen.ui.webview.CommonWebViewActivity
 import com.mango.moshen.utils.MsgBuilder
 import com.mango.moshen.utils.UserUtils
 import com.mango.xchat_android_library.utils.ListUtils
+import com.tencent.qgame.animplayer.util.ScaleType
 import io.reactivex.Observable
 import io.reactivex.ObservableEmitter
 import io.reactivex.ObservableOnSubscribe
@@ -1416,7 +1414,7 @@ class RoomEffectView @JvmOverloads constructor(
         }
         isSvgaPlaying = true
         binding.vapAnimView.visibility = VISIBLE
-        binding.vapAnimView.loadAnim(viewUrl)
+        binding.vapAnimView.loadAnim(viewUrl, ScaleType.FIT_CENTER)
     }
 
     /**
diff --git a/app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt
index 55471c118..6a7d1964a 100644
--- a/app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt
+++ b/app/src/main/java/com/mango/moshen/ui/utils/ImageLoad.kt
@@ -144,7 +144,8 @@ fun SVGAImageView.loadFromAssets(name: String) {
     }
 }
 
-fun AnimView.loadAnim(url: String) {
+@JvmOverloads
+fun AnimView.loadAnim(url: String, scaleType: ScaleType = ScaleType.CENTER_CROP) {
 
     if (context.isDestroyed()) return
 
@@ -162,7 +163,7 @@ fun AnimView.loadAnim(url: String) {
             }
 
             override fun onResourceReady(resource: File, transition: Transition<in File>?) {
-                this@loadAnim.setScaleType(ScaleType.CENTER_CROP)
+                this@loadAnim.setScaleType(scaleType)
                 this@loadAnim.startPlay(resource)
             }
         })
diff --git a/app/src/main/res/layout/layout_room_effect.xml b/app/src/main/res/layout/layout_room_effect.xml
index 6be84b804..e85d0713b 100644
--- a/app/src/main/res/layout/layout_room_effect.xml
+++ b/app/src/main/res/layout/layout_room_effect.xml
@@ -14,7 +14,7 @@
             android:id="@+id/room_car_svga"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop"
+            android:scaleType="fitCenter"
             android:visibility="gone"
             app:autoPlay="true" />