From cee34e7d7613a968c867995ea4d385a917cb23e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Thu, 16 Jan 2020 14:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=A7=86=E9=A2=91=E6=B5=81?=
 =?UTF-8?q?=E6=9A=82=E5=81=9C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/gamecenter/video/detail/DetailPlayerView.kt   | 4 +++-
 .../gamecenter/video/detail/VideoDetailContainerFragment.kt   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 01ad4f60df..3f0d32bb76 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
@@ -363,10 +363,12 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib
             setViewShowState(mBottomProgressBar, if (isBottomContainerShow) View.GONE else View.VISIBLE)
             if (mScheduledHideDisposable != null && !mScheduledHideDisposable!!.isDisposed) {
                 mScheduledHideDisposable!!.dispose()
+                mScheduledHideDisposable = null
             }
             mScheduledHideDisposable = rxTimer(1) { times ->
-                if (times >= 1500) {
+                if (times >= 1500 && currentState == CURRENT_STATE_PLAYING) {
                     mScheduledHideDisposable?.dispose()
+                    mScheduledHideDisposable = null
                     hideAllWidget()
                 }
             }
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 b687a2be26..f2c870d719 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
@@ -254,7 +254,7 @@ class VideoDetailContainerFragment : BaseLazyFragment(), OnBackPressedListener {
                 val videoView = findFirstCompletelyVisibleVideoViewByPosition()
                 videoView?.observeVolume(requireActivity() as AppCompatActivity)
 
-                if (isVisible) {
+                if (userVisibleHint) {
                     //延时处理，快速滑动不播放视频
                     mScheduledPlayDisposable = rxTimer(1) {
                         if (it >= 500) {