diff --git a/app/src/main/assets/tab_community.gif b/app/src/main/assets/tab_community.gif index c9e298390c..72deb01d6b 100644 Binary files a/app/src/main/assets/tab_community.gif and b/app/src/main/assets/tab_community.gif differ diff --git a/app/src/main/assets/tab_mine.gif b/app/src/main/assets/tab_mine.gif index a3360a4818..c980a0edb6 100644 Binary files a/app/src/main/assets/tab_mine.gif and b/app/src/main/assets/tab_mine.gif differ diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/video/TopVideoView.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/video/TopVideoView.kt index ad0fe00282..348208a66a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/video/TopVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/video/TopVideoView.kt @@ -213,11 +213,12 @@ class TopVideoView @JvmOverloads constructor(context: Context, attrs: AttributeS //播放完成后判断是否已缓冲完毕,没有完成显示播放错误状态 if (mBufferPoint != 0 && mBufferPoint != 100 && isShown) { - Utils.toast(context, "网络错误,视频播放失败") +// Utils.toast(context, "网络错误,视频播放失败") gsyVideoManager.releaseMediaPlayer() changeUiToPreparingShow() postDelayed({ if (!NetworkUtils.isAvailable(mContext)) { + Utils.toast(context, "网络错误,视频播放失败") changeUiToError() } }, 10 * 1000) diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt index c6a29c72ca..7af97d4bcf 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt @@ -333,10 +333,21 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib AppExecutor.uiExecutor.executeWithDelay(Runnable { if (mCurrentState == CURRENT_STATE_PREPAREING) { setViewShowState(mLoadingProgressBar, View.VISIBLE) + delay() } }, 2000) } + private fun delay() { + AppExecutor.uiExecutor.executeWithDelay(Runnable { + if (mCurrentState == CURRENT_STATE_PREPAREING) { + if (!NetworkUtils.isAvailable(mContext)) { + changeUiToError() + } + } + }, 10 * 1000) + } + override fun changeUiToPlayingShow() { super.changeUiToPlayingShow() if (!byStartedClick) { diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt index 0227c6fe90..bde9400a94 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt @@ -419,12 +419,20 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener { if (pauseVideo[mViewModel.uuid] == true) { CustomManager.onPause("detail_${mViewModel.uuid}") } + if (slideGuideAnimation.isAnimating) { + slideGuideAnimation.cancelAnimation() + guideRl.visibility = View.GONE + } + SPUtils.setBoolean(Constants.SP_SHOW_SLIDE_GUIDE, true) super.onFragmentPause() } override fun onDestroyView() { findFirstCompletelyVisibleVideoViewByPosition()?.uploadVideoStreamingPlaying("退出页面") CustomManager.releaseAllVideos("detail_${mViewModel.uuid}") + mBaseHandler.postDelayed({ + CustomManager.releaseAllVideos("detail_${mViewModel.uuid}") + }, 500) CacheManager.getInstance().removeAllCall() if (mAdCountDownTimer != null && !mAdCountDownTimer!!.isDisposed) { mAdCountDownTimer?.dispose() diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index 256deda623..ddb77c05cd 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" + android:descendantFocusability="blocksDescendants" android:paddingBottom="54dp"> true - true + false