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 2a0dedfa46..7e0e1a06e6 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 @@ -3,6 +3,7 @@ package com.mogo.och.bus.passenger.ui.widget.video import android.content.Context import android.media.AudioManager import android.util.AttributeSet +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.shuyu.gsyvideoplayer.utils.Debuger import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer @@ -60,8 +61,8 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { setViewShowState(mBackButton, INVISIBLE) setViewShowState(mStartButton, INVISIBLE) - setViewShowState(mThumbImageViewLayout, VISIBLE) - setViewShowState(mThumbImageView, VISIBLE) +// setViewShowState(mThumbImageViewLayout, VISIBLE) +// setViewShowState(mThumbImageView, VISIBLE) setViewShowState(mTopContainer, INVISIBLE) @@ -75,11 +76,13 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { } fun setCacheImageViewVisible() { + Logger.d(ImageAndVideoRotation.TAG, "CacheImageViewVISIBLE") setViewShowState(mThumbImageViewLayout, VISIBLE) setViewShowState(mThumbImageView, VISIBLE) } fun setCacheImageViewGone() { + Logger.d(ImageAndVideoRotation.TAG, "CacheImageViewGONE") setViewShowState(mThumbImageViewLayout, INVISIBLE) setViewShowState(mThumbImageView, INVISIBLE) } diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt index 2418a5c090..241e37b44b 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -147,7 +147,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter private var gsySampleCallBack = object : GSYSampleCallBack() { override fun onPrepared(url: String?, vararg objects: Any?) { - Logger.d(ImageAndVideoRotation.TAG, "onPrepared") + Logger.d(ImageAndVideoRotation.TAG, "onPrepared--$url") if (viewList[mViewPager.currentItem] is AdvanceVideoView){ val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) UiThreadHandler.postDelayed(Runnable { @@ -157,22 +157,22 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter } override fun onAutoComplete(url: String?, vararg objects: Any?) { - Logger.d(ImageAndVideoRotation.TAG, "onAutoComplete()") + Logger.d(ImageAndVideoRotation.TAG, "onAutoComplete()-$url") if (viewList[mViewPager.currentItem] is AdvanceVideoView){ val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) videoView.onVideoReset() - videoView.setCacheImageViewVisible() +// videoView.setCacheImageViewVisible() goNextItemView() } } override fun onPlayError(url: String?, vararg objects: Any?) { super.onPlayError(url, *objects) - Logger.d(ImageAndVideoRotation.TAG, "onPlayError()-${objects}") + Logger.d(ImageAndVideoRotation.TAG, "onPlayError()-$url") if (viewList[mViewPager.currentItem] is AdvanceVideoView){ val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) videoView.onVideoReset() - videoView.setCacheImageViewVisible() +// videoView.setCacheImageViewVisible() videoView.clearLocalErrorVideo() goNextItemView() } 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 5ff5e7feab..d97e706582 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 @@ -82,8 +82,6 @@ class AdvanceVideoView @JvmOverloads constructor( if (pathList.isNotEmpty()){ this.downloadVideoName = pathList[pathList.size - 1] } - - loadCacheImg() } private fun loadCacheImg() { @@ -128,6 +126,7 @@ class AdvanceVideoView @JvmOverloads constructor( } fun setVideo(onCompletionListener: GSYSampleCallBack) { + loadCacheImg() Logger.d(ImageAndVideoRotation.TAG, "setVideo") mOnCompletionListener = onCompletionListener //判断是否已经下载 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 49a1f1fc0a..7a7965c37d 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 @@ -88,7 +88,6 @@ class AdvanceVideoView @JvmOverloads constructor( if (pathList.isNotEmpty()) { this.downloadVideoName = pathList[pathList.size - 1] } - loadCacheImg() } private fun loadCacheImg() { @@ -126,6 +125,7 @@ class AdvanceVideoView @JvmOverloads constructor( } fun setVideo(onCompletionListener: GSYSampleCallBack) { + loadCacheImg() Logger.d(ImageVideoRotationView.TAG, "setVideo") mOnCompletionListener = onCompletionListener //判断是否已经下载 @@ -390,7 +390,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter if (viewList[mViewPager.currentItem] is AdvanceVideoView) { val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) videoView.onVideoReset() - videoView.setCacheImageViewVisible() +// videoView.setCacheImageViewVisible() goNextItemView() } } @@ -401,7 +401,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter if (viewList[mViewPager.currentItem] is AdvanceVideoView) { val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) videoView.onVideoReset() - videoView.setCacheImageViewVisible() +// videoView.setCacheImageViewVisible() videoView.clearLocalErrorVideo() goNextItemView() } @@ -533,8 +533,8 @@ class AdvanceGSYVideoPlayer : StandardGSYVideoPlayer { setViewShowState(mTopContainer, INVISIBLE) setViewShowState(mLoadingProgressBar, INVISIBLE) - setViewShowState(mThumbImageViewLayout, VISIBLE) - setViewShowState(mThumbImageView, VISIBLE) +// setViewShowState(mThumbImageViewLayout, VISIBLE) +// setViewShowState(mThumbImageView, VISIBLE) setViewShowState( mLockScreen, INVISIBLE @@ -545,11 +545,15 @@ class AdvanceGSYVideoPlayer : StandardGSYVideoPlayer { } fun setCacheImageViewVisible() { + Logger.d("ImageAndVideoRotation", "CacheImageViewVISIBLE") + setViewShowState(mThumbImageViewLayout, VISIBLE) setViewShowState(mThumbImageView, VISIBLE) } fun setCacheImageViewGone() { + Logger.d("ImageAndVideoRotation", "CacheImageViewGONE") + setViewShowState(mThumbImageViewLayout, INVISIBLE) setViewShowState(mThumbImageView, INVISIBLE) }