From cd7a15ad424cda2b05a1229960781dfe5a1c38ca Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 13 Mar 2023 18:05:58 +0800
Subject: [PATCH] =?UTF-8?q?[M2]=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/widget/video/AdvanceGSYVideoPlayer.kt     |  4 ++--
 .../ui/widget/video/AdvanceVideoView.kt          | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
index 7e0e1a06e6..dad98265ae 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
@@ -61,8 +61,8 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
         setViewShowState(mBackButton, INVISIBLE)
         setViewShowState(mStartButton, INVISIBLE)
 
-//        setViewShowState(mThumbImageViewLayout, VISIBLE)
-//        setViewShowState(mThumbImageView, VISIBLE)
+        setViewShowState(mThumbImageViewLayout, INVISIBLE)
+        setViewShowState(mThumbImageView, INVISIBLE)
 
         setViewShowState(mTopContainer, INVISIBLE)
 
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
index d41aca1126..992a389c8f 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
@@ -6,8 +6,6 @@ import android.net.Uri
 import android.util.AttributeSet
 import android.widget.ImageView
 import android.widget.RelativeLayout
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
 import com.mogo.eagle.core.utilcode.breakpoint.bean.ThreadBean
 import com.mogo.eagle.core.utilcode.breakpoint.callback.IDownload
 import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils
@@ -18,7 +16,6 @@ import com.mogo.och.bus.passenger.R
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
 import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack
 import java.io.File
-import java.lang.Exception
 
 /**
  * @author: wangmingjun
@@ -45,13 +42,14 @@ class AdvanceVideoView @JvmOverloads constructor(
     }
 
     private fun initView() {
-        initCacheImgView()
         initVideoView()
+        initCacheImgView()
     }
 
     private fun initCacheImgView() {
         cacheImage = ImageView(context)
         cacheImage?.scaleType = ImageView.ScaleType.FIT_XY
+        addView(cacheImage, LayoutParams(-1, -1))
     }
 
     private fun initVideoView() {
@@ -103,7 +101,7 @@ class AdvanceVideoView @JvmOverloads constructor(
 //                        )
 //                        .into(it)
 //                }
-        videoViewPlayer?.thumbImageView = cacheImage
+//        videoViewPlayer?.thumbImageView = cacheImage
         setCacheImageViewVisible()
 //            }
 //        }
@@ -118,11 +116,13 @@ class AdvanceVideoView @JvmOverloads constructor(
 
     @SuppressLint("CheckResult")
     fun setCacheImageViewVisible() {
-        videoViewPlayer?.setCacheImageViewVisible()
+//        videoViewPlayer?.setCacheImageViewVisible()
+        cacheImage?.visibility = VISIBLE
     }
 
     fun setCacheImageViewGone() {
-        videoViewPlayer?.setCacheImageViewGone()
+        cacheImage?.visibility = GONE
+//        videoViewPlayer?.setCacheImageViewGone()
 //        videoViewPlayer?.clearThumbImageView()
     }
 
@@ -191,6 +191,7 @@ class AdvanceVideoView @JvmOverloads constructor(
 
     private val downListener = object : IDownload{
         override fun onStart(url: String?) {
+            setCacheImageViewVisible()
             Logger.d(ImageAndVideoRotation.TAG, "download-onStart")
         }
 
@@ -207,6 +208,7 @@ class AdvanceVideoView @JvmOverloads constructor(
         }
 
         override fun onFinished(url: String?, threadBean: ThreadBean?) {
+            setCacheImageViewGone()
             Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url")
             if (url.equals(fileNetPath)){ //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题
                 //下载完成