From 8bc9544dc2618ecbeecebdbc5b42bd2f0a191855 Mon Sep 17 00:00:00 2001
From: lyr <15622190878@163.com>
Date: Thu, 1 Jul 2021 16:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5.0.0-?=
 =?UTF-8?q?=E6=96=B0=E7=A4=BE=E5=8C=BA=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=880630=20=E8=BF=90=E8=90=A5=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202=EF=BC=89https://git.ghzs.com/pm/halo-app-issues/-?=
 =?UTF-8?q?/issues/1253#note=5F106346?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forum/detail/ForumArticleAskListFragment.kt  |  9 +--------
 .../forum/home/ArticleItemVideoView.kt           |  8 ++++----
 .../forum/home/ForumArticleListFragment.kt       |  9 +--------
 .../forum/home/ForumScrollCalculatorHelper.kt    |  8 ++------
 .../gamecenter/personalhome/UserHomeFragment.kt  | 13 +++++++++----
 .../personalhome/home/UserHistoryFragment.kt     | 16 ++++++----------
 6 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
index b335805587..e3de5532b3 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
@@ -161,14 +161,7 @@ class ForumArticleAskListFragment : ListFragment<AnswerEntity, ForumArticleAskLi
                     //这里必须要延迟操作，否则会白屏
                     mBaseHandler.postDelayed({
                         if (position != 0L) {
-                            currentPlayer?.seekTo(position)
-                            currentPlayer?.onVideoResume(false)
-                            val videoVoiceStatus = SPUtils.getBoolean(Constants.SP_VIDEO_PLAY_MUTE, true)
-                            if (videoVoiceStatus) {
-                                currentPlayer?.mute()
-                            } else {
-                                currentPlayer?.unMute()
-                            }
+                            currentPlayer?.startPlayLogic(true)
                         } else {
                             currentPlayer?.release()
                         }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt
index 2c28979e0d..84d4492522 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt
@@ -67,10 +67,10 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At
 
     fun startPlayLogic(isAutoPlay: Boolean) {
         mIsAutoPlay = isAutoPlay
-//        if (mIsAutoPlay) {
-//            val seekTime = ForumScrollCalculatorHelper.getPlaySchedule(MD5Utils.getContentMD5(mVideoEntity?.url))
-//            seekOnStart = seekTime
-//        }
+        if (mIsAutoPlay) {
+            val seekTime = ForumScrollCalculatorHelper.getPlaySchedule(MD5Utils.getContentMD5(mVideoEntity?.url))
+            seekOnStart = seekTime
+        }
         startPlayLogic()
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
index 845cd2b3c1..e8126ca9de 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
@@ -222,14 +222,7 @@ class ForumArticleListFragment : LazyListFragment<ArticleEntity, ForumArticleLis
                     //这里必须要延迟操作，否则会白屏
                     mBaseHandler.postDelayed({
                         if (position != 0L) {
-                            currentPlayer?.seekTo(position)
-                            currentPlayer?.onVideoResume(false)
-                            val videoVoiceStatus = SPUtils.getBoolean(Constants.SP_VIDEO_PLAY_MUTE, true)
-                            if (videoVoiceStatus) {
-                                currentPlayer?.mute()
-                            } else {
-                                currentPlayer?.unMute()
-                            }
+                            currentPlayer?.startPlayLogic(true)
                         } else {
                             currentPlayer?.release()
                         }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt
index d202a78b76..aa42e22c10 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumScrollCalculatorHelper.kt
@@ -19,8 +19,7 @@ import com.shuyu.gsyvideoplayer.video.base.GSYBaseVideoPlayer
 
 class ForumScrollCalculatorHelper(private val horizontalId: Int,
                                   private val verticalId: Int,
-                                  private val rangeTop: Int,
-                                  private val isUserHomePage: Boolean = false) {
+                                  private val rangeTop: Int) {
     private var firstVisible = -1
     private var lastVisible = 0
     private var visibleCount = 0
@@ -128,16 +127,13 @@ class ForumScrollCalculatorHelper(private val horizontalId: Int,
                 gsyBaseVideoPlayer.getLocationInWindow(screenPosition)
                 val rangePosition = screenPosition[1]
                 if (rangePosition >= rangeTop) {
+                    runnable = PlayRunnable(gsyBaseVideoPlayer)
                     if (currentPlayer != null) {
                         CustomManager.releaseAllVideos(currentPlayer?.getKey())
 //                        currentPlayer?.resetDetailMask()
                     }
                     currentPlayer = gsyBaseVideoPlayer
                     currentPosition = i
-
-                    if (isUserHomePage) break
-
-                    runnable = PlayRunnable(gsyBaseVideoPlayer)
                     //降低频率
                     playHandler.postDelayed(runnable!!, 100)
                     break
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
index 05ca0e8a3e..24a7447025 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
@@ -14,6 +14,7 @@ import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import butterknife.OnClick
 import com.gh.base.adapter.FragmentAdapter
@@ -57,6 +58,7 @@ class UserHomeFragment : NormalFragment() {
     private lateinit var mPopupWindow: PopupWindow
     private var mBadgeCount = 0
     private var mPlayGameCount = 0
+    private var mFragmentList = listOf<Fragment>()
 
     override fun getInflatedLayout(): View {
         mHomeBinding = DataBindingUtil.inflate(requireActivity().layoutInflater, R.layout.fragment_home, null, false)
@@ -308,13 +310,16 @@ class UserHomeFragment : NormalFragment() {
 //        val videoFragment = childFragmentManager.findFragmentByTag("${tag}2")
 //                ?: UserVideoHistoryFragment.getInstance(mUserHomeViewModel.userId, count)
 
-        val fragmentList = listOf(gameFragment, qaFragment)
+        mFragmentList = listOf(gameFragment, qaFragment)
         val titleList = listOf("游戏", "发布")
 
-        viewpager.offscreenPageLimit = fragmentList.size
-        viewpager.adapter = FragmentAdapter(childFragmentManager, fragmentList, titleList)
+        viewpager.offscreenPageLimit = mFragmentList.size
+        viewpager.adapter = FragmentAdapter(childFragmentManager, mFragmentList, titleList)
         viewpager.currentItem = position
-        viewpager.doOnPageSelected { MtaHelper.onEvent("个人主页详情", "个人主页详情", titleList[it]) }
+        viewpager.doOnPageSelected {
+            MtaHelper.onEvent("个人主页详情", "个人主页详情", titleList[it])
+            if (it == 1) (mFragmentList[1] as UserHistoryFragment).onScrollStateChanged()
+        }
         tabLayout.setupWithViewPager(viewpager)
         tabIndicator.setupWithTabLayout(tabLayout)
         tabIndicator.setupWithViewPager(viewpager)
diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
index 6bcf211f6e..e1eda467d0 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt
@@ -53,7 +53,7 @@ class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewM
             mCount = getParcelable(COUNT) ?: PersonalEntity.Count()
         }
         super.onCreate(savedInstanceState)
-        mScrollCalculatorHelper = ForumScrollCalculatorHelper(R.id.horizontalVideoView, R.id.verticalVideoView, 0, true)
+        mScrollCalculatorHelper = ForumScrollCalculatorHelper(R.id.horizontalVideoView, R.id.verticalVideoView, 0)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -87,6 +87,10 @@ class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewM
         mScrollCalculatorHelper?.currentPlayer?.release()
     }
 
+    fun onScrollStateChanged() {
+        mScrollCalculatorHelper?.onScrollStateChanged(mListRv, RecyclerView.SCROLL_STATE_IDLE)
+    }
+
     private fun scroll() {
         val firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition()
         val lastVisibleItem = mLayoutManager.findLastVisibleItemPosition()
@@ -102,18 +106,10 @@ class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewM
                     //这里必须要延迟操作，否则会白屏
                     mBaseHandler.postDelayed({
                         if (position != 0L) {
-                            currentPlayer?.seekTo(position)
-                            currentPlayer?.onVideoResume(false)
-                            val videoVoiceStatus = SPUtils.getBoolean(Constants.SP_VIDEO_PLAY_MUTE, true)
-                            if (videoVoiceStatus) {
-                                currentPlayer?.mute()
-                            } else {
-                                currentPlayer?.unMute()
-                            }
+                            currentPlayer?.startPlayLogic(true)
                         } else {
                             currentPlayer?.release()
                         }
-
                     }, 50)
                 }
             }