From ae7fb34fa10decc530ab8bc0d71929863b9f2799 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 13 Mar 2023 21:35:08 +0800 Subject: [PATCH] =?UTF-8?q?[M2]=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BA=BF=E7=A8=8B?= 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 | 21 +++++++++---------- .../module/wigets/video/VideoPlayerView.kt | 13 +++++++++--- 3 files changed, 22 insertions(+), 16 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 dad98265ae..5804f36da4 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, INVISIBLE) - setViewShowState(mThumbImageView, INVISIBLE) +// 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 3396fee443..1ea3cad537 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 @@ -50,7 +50,7 @@ class AdvanceVideoView @JvmOverloads constructor( private fun initCacheImgView() { cacheImage = ImageView(context) cacheImage?.scaleType = ImageView.ScaleType.FIT_XY - addView(cacheImage, LayoutParams(-1, -1)) +// addView(cacheImage, LayoutParams(-1, -1)) } private fun initVideoView() { @@ -102,7 +102,7 @@ class AdvanceVideoView @JvmOverloads constructor( // ) // .into(it) // } -// videoViewPlayer?.thumbImageView = cacheImage + videoViewPlayer?.thumbImageView = cacheImage setCacheImageViewVisible() // } // } @@ -117,20 +117,18 @@ class AdvanceVideoView @JvmOverloads constructor( @SuppressLint("CheckResult") fun setCacheImageViewVisible() { - Logger.d(ImageAndVideoRotation.TAG, "setCacheImageViewVisible") -// videoViewPlayer?.setCacheImageViewVisible() UiThreadHandler.post { - cacheImage?.visibility = VISIBLE +// cacheImage?.visibility = VISIBLE + videoViewPlayer?.setCacheImageViewVisible() } } fun setCacheImageViewGone() { - Logger.d(ImageAndVideoRotation.TAG, "setCacheImageViewGone") UiThreadHandler.post { - cacheImage?.visibility = GONE +// cacheImage?.visibility = GONE + videoViewPlayer?.setCacheImageViewGone() } -// videoViewPlayer?.setCacheImageViewGone() -// videoViewPlayer?.clearThumbImageView() + } fun setVideo(onCompletionListener: GSYSampleCallBack) { @@ -215,7 +213,6 @@ class AdvanceVideoView @JvmOverloads constructor( } override fun onFinished(url: String?, threadBean: ThreadBean?) { - setCacheImageViewGone() Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url") if (url.equals(fileNetPath)){ //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题 //下载完成 @@ -227,7 +224,9 @@ class AdvanceVideoView @JvmOverloads constructor( ",currentUrl = $fileNetPath ") if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){ Logger.d(ImageAndVideoRotation.TAG, "have download startPlay") - startPlay() + ThreadUtils.runOnUiThread { + startPlay() + } return }else{ startDownLoadVideo() diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt index e7a306d261..3c5036a71e 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/video/VideoPlayerView.kt @@ -118,11 +118,15 @@ class AdvanceVideoView @JvmOverloads constructor( @SuppressLint("CheckResult") fun setCacheImageViewVisible() { - videoViewPlayer?.setCacheImageViewVisible() + UiThreadHandler.post { + videoViewPlayer?.setCacheImageViewVisible() + } } fun setCacheImageViewGone() { - videoViewPlayer?.setCacheImageViewGone() + UiThreadHandler.post { + videoViewPlayer?.setCacheImageViewGone() + } } fun setVideo(onCompletionListener: GSYSampleCallBack) { @@ -193,6 +197,7 @@ class AdvanceVideoView @JvmOverloads constructor( private val downListener = object : IDownload { override fun onStart(url: String?) { + setCacheImageViewVisible() Logger.d(ImageVideoRotationView.TAG, "download-onStart") } @@ -222,7 +227,9 @@ class AdvanceVideoView @JvmOverloads constructor( ) if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) { Logger.d(ImageVideoRotationView.TAG, "have download startPlay") - startPlay() + ThreadUtils.runOnUiThread { + startPlay() + } return } else { startDownLoadVideo()