From da97690964dc29df123907cdeee811ec6e826a11 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 24 Jun 2022 18:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/video/TaxiPassengerMogoConsultView.kt  | 13 +++++++++++--
 .../passenger/widget/ConsultVideoPlayer.kt    | 19 +++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
index c8f4bb7eba..e06ed2481b 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/TaxiPassengerMogoConsultView.kt
@@ -14,8 +14,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.SimpleTarget
 import com.bumptech.glide.request.transition.Transition
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerVideoPlay
 import com.mogo.och.taxi.passenger.ui.video.layoutmanage.CarouselLayoutManager
@@ -177,6 +176,16 @@ class TaxiPassengerMogoConsultView :RelativeLayout {
                     super.onClickBlank(url, *objects)
                     rvVideoPlaylist.smoothScrollToPosition(centerItemPosition)
                 }
+
+                override fun onPlayError(url: String?, vararg objects: Any?) {
+                    super.onPlayError(url, *objects)
+                    ToastUtils.showLong("哎呀，出错了，看看其他视频吧")
+                }
+
+                override fun onClickStartError(url: String?, vararg objects: Any?) {
+                    super.onClickStartError(url, *objects)
+                    ToastUtils.showLong("哎呀，出错了，看看其他视频吧")
+                }
             })
         }
     }
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
index d8b290215c..ef8ad63d3d 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt
@@ -11,6 +11,7 @@ import android.widget.TextView
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.utilcode.util.TimeTransformUtils
+import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.ui.video.FullVideoUtils
@@ -40,6 +41,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
     private lateinit var layoutBottom: ConstraintLayout
 
     private var fullVideoPlayer:ConsultVideoPlayer?=null
+    private var smalllPlayer:ConsultVideoPlayer?=null
 
     private var currentTime = 0
 
@@ -81,10 +83,6 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
                 start.setImageResource(R.drawable.notice_video_pause)
                 aivStartPlay.visibility = View.GONE
             }
-            GSYVideoView.CURRENT_STATE_ERROR ->{
-                start.setImageResource(R.drawable.notice_video_pause)
-                aivStartPlay.visibility = View.GONE
-            }
             else -> {
                 start.setImageResource(R.drawable.notice_video_after_pause)
                 aivStartPlay.visibility = View.VISIBLE
@@ -187,6 +185,14 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
 
     override fun onError(what: Int, extra: Int) {
         super.onError(what, extra)
+        mThumbImageViewLayout?.visibility = View.VISIBLE
+        ToastUtils.showLong("哎呀，出错了，看看其他视频吧")
+        currentTime = -1
+        if(isIfCurrentIsFullscreen){
+            smalllPlayer?.clearFullscreenLayout(this)
+            smalllPlayer?.currentTime = -1
+            FullVideoUtils.dismissOverlayView()
+        }
     }
 
     override fun setViewShowState(view: View?, visibility: Int) {
@@ -305,6 +311,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
                     }
                 }
             }
+            gsyVideoPlayer.smalllPlayer = this
             frameLayout.setBackgroundColor(Color.BLACK)
             val lp = LayoutParams(width, height)
             frameLayout.addView(gsyVideoPlayer, lp)
@@ -366,9 +373,10 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         checkAutoFullWithSizeAndAdaptation(gsyVideoPlayer)
     }
 
-    private fun clearFullscreenLayout(gsyVideoPlayer:GSYVideoPlayer) {
+    private fun clearFullscreenLayout(gsyVideoPlayer:ConsultVideoPlayer) {
         mIfCurrentIsFullscreen = false
         val delay = 0
+        gsyVideoPlayer.smalllPlayer = null
         mInnerHandler.postDelayed({ resolveNormalVideoShow(gsyVideoPlayer) }, delay.toLong())
     }
 
@@ -382,7 +390,6 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         addTextureView()
         mSaveChangeViewTIme = System.currentTimeMillis()
         if (mVideoAllCallBack != null) {
-            Debuger.printfError("onQuitFullscreen")
             mVideoAllCallBack.onQuitFullscreen(mOriginUrl, mTitle, this)
         }
         mIfCurrentIsFullscreen = false