From 7840f4de0a5bbe6bb3e66eec62a8de1d6444ac3b Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 17 Jan 2025 10:45:21 +0800
Subject: [PATCH] =?UTF-8?q?[6.10.0]=20[fix]=20[=E4=B8=80=E4=B8=AA=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=B9=BF=E5=91=8A=E6=B2=A1=E6=9C=89=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/wigets/media/MediaLoopPlayView.kt  |  7 +++++
 .../wigets/media/MediaPlayerCustomView.kt     | 29 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt
index 2d508bd2a4..3c95f294e2 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt
@@ -384,6 +384,13 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter
                 return
             }
         }
+        if(currentItemView is AdvanceImageView){
+            if(mItemViewList.size == 1){
+                currentItemView.displayImage()
+                startImageCountDownTimer()
+                return
+            }
+        }
         if (currentPosition == mItemViewList.size - 1) {
             //已经到最后一个, 从头开始
             mViewPager.post {
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt
index f2d870f1dc..899639d571 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt
@@ -1,4 +1,5 @@
 import android.content.Context
+import android.graphics.Bitmap
 import android.media.AudioManager
 import android.net.Uri
 import android.text.TextUtils
@@ -6,7 +7,11 @@ import android.util.AttributeSet
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.Target
 import com.mogo.eagle.core.utilcode.download.callback.IDownloadListener
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
@@ -436,7 +441,29 @@ class AdvanceImageView @JvmOverloads constructor(
                     .error(placeholderDrawable)
                     .fallback(placeholderDrawable)
                     .centerCrop()
-            ).into(it)
+            ).listener(object :RequestListener<Bitmap>{
+                override fun onLoadFailed(
+                    e: GlideException?,
+                    model: Any?,
+                    target: Target<Bitmap>?,
+                    isFirstResource: Boolean
+                ): Boolean {
+                    MediaPlayLogger.printErrorLog("图片加载失败:${e?.message}")
+                    return false
+                }
+
+                override fun onResourceReady(
+                    resource: Bitmap?,
+                    model: Any?,
+                    target: Target<Bitmap>?,
+                    dataSource: DataSource?,
+                    isFirstResource: Boolean
+                ): Boolean {
+                    return false
+                }
+
+            })
+                .into(it)
         }
     }
 }
\ No newline at end of file