From ae3282e554f11af35d45cb8ba3afa4ea77145fcd Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 8 Mar 2023 22:38:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[M2]=20=E8=A7=86=E9=A2=91=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt | 3 +++ .../och/bus/passenger/ui/widget/video/AdvanceVideoView.kt | 4 ++-- 2 files changed, 5 insertions(+), 2 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 a440701f00..f4a1febc12 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 @@ -67,6 +67,9 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { mLockScreen, INVISIBLE ) + setViewShowState(mThumbImageViewLayout, INVISIBLE) + setViewShowState(mThumbImageView, INVISIBLE) + setIsTouchWiget(false) isFocusableInTouchMode = false } 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 2e4772adec..272d87d77e 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 @@ -88,6 +88,7 @@ class AdvanceVideoView @JvmOverloads constructor( private fun loadCacheImg() { // BitmapHelper.getVideoThumbnail(path) /*获取第一帧图* + videoViewPlayer?.thumbImageView = cacheImage cacheImage?.setImageResource(R.drawable.m2_p_video_holder) setCacheImageViewVisible() // OCHThreadPoolManager.getsInstance().execute { @@ -118,13 +119,12 @@ class AdvanceVideoView @JvmOverloads constructor( @SuppressLint("CheckResult") fun setCacheImageViewVisible() { - videoViewPlayer?.thumbImageView = cacheImage videoViewPlayer?.setCacheImageViewVisible() } fun setCacheImageViewGone() { videoViewPlayer?.setCacheImageViewGone() - videoViewPlayer?.clearThumbImageView() +// videoViewPlayer?.clearThumbImageView() } fun setVideo(onCompletionListener: GSYSampleCallBack) { From 167c78c49c0487382915e9222d4b49601387bb9b Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 9 Mar 2023 00:26:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[M2]=20=E8=A7=86=E9=A2=91=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD=E7=BD=91=E7=BB=9C=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/widget/video/AdvanceVideoView.kt | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) 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 272d87d77e..56bdc28209 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 @@ -14,7 +14,9 @@ import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R +import com.mogo.och.bus.passenger.constant.BusPassengerConst.Companion.DOWNLOAD_DELAY import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import java.io.File @@ -96,16 +98,16 @@ class AdvanceVideoView @JvmOverloads constructor( Logger.d(ImageAndVideoRotation.TAG, "setVideoPath") // ThreadUtils.runOnUiThread { // Logger.d(ImageAndVideoRotation.TAG, "bitmap加载") -// cacheImage?.let { -// Glide.with(context).load(cacheImageUrl) -// .apply( -// RequestOptions().placeholder(R.drawable.m2_p_video_holder) -// .error(R.drawable.m2_p_video_holder) -// .fallback(R.drawable.m2_p_video_holder) -// .centerCrop() -// ) -// .into(it) -// } + cacheImage?.let { + Glide.with(context).load(cacheImageUrl) + .apply( + RequestOptions().placeholder(R.drawable.m2_p_video_holder) + .error(R.drawable.m2_p_video_holder) + .fallback(R.drawable.m2_p_video_holder) + .centerCrop() + ) + .into(it) + } // } // } } @@ -196,6 +198,10 @@ class AdvanceVideoView @JvmOverloads constructor( override fun onPause(url: String?, threadBean: ThreadBean?) { Logger.d(ImageAndVideoRotation.TAG, "download-onPause") +// UiThreadHandler.postDelayed(Runnable { +// startDownLoadVideo() +// },DOWNLOAD_DELAY) + // todo 测试下网络断掉是否会走opause，且网络回复也不会继续下载 } override fun onProgress(url: String?, length: Int) { From eed1ce50036d7a07e79a489302e06206f73c9d0e Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 9 Mar 2023 09:17:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[M2]=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt | 2 -- 1 file changed, 2 deletions(-) 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 56bdc28209..719b87de4c 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 @@ -14,9 +14,7 @@ import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R -import com.mogo.och.bus.passenger.constant.BusPassengerConst.Companion.DOWNLOAD_DELAY import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack import java.io.File