From 1bcb343355d671c7784c8697c0e4a492f1640bf5 Mon Sep 17 00:00:00 2001
From: lyr <15622190878@163.com>
Date: Thu, 1 Jul 2021 17:54:36 +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=204=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   | 10 +++++++++-
 .../forum/detail/ForumDetailActivity.kt           | 15 +++++++++++++--
 .../forum/detail/ForumDetailFragment.kt           |  4 ++++
 .../forum/home/CommunityHomeFragment.kt           |  9 +++++++++
 .../forum/home/ForumArticleListFragment.kt        | 10 +++++++++-
 .../gamecenter/fragment/MainWrapperFragment.java  |  8 +++++++-
 .../gamecenter/personalhome/UserHomeFragment.kt   |  9 +++++++++
 .../personalhome/home/UserHistoryFragment.kt      | 11 +++++++++--
 8 files changed, 69 insertions(+), 7 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 e3de5532b3..f6b2beffaf 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
@@ -5,7 +5,6 @@ import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.AppExecutor
-import com.gh.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.common.view.divider.HorizontalDividerItemDecoration
 import com.gh.gamecenter.R
@@ -16,6 +15,7 @@ import com.gh.gamecenter.eventbus.EBTypeChange
 import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper
 import com.gh.gamecenter.qa.CommunityFragment
 import com.gh.gamecenter.qa.entity.AnswerEntity
+import com.gh.gamecenter.video.detail.CustomManager
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -195,6 +195,14 @@ class ForumArticleAskListFragment : ListFragment<AnswerEntity, ForumArticleAskLi
 
     override fun provideSyncAdapter(): ForumArticleAskListAdapter = mAdapter
 
+    override fun onBackPressed(): Boolean {
+        mScrollCalculatorHelper?.currentPlayer?.run {
+            return (isIfCurrentIsFullscreen
+                    && CustomManager.backFromWindowFull(requireActivity(), getKey()))
+        }
+        return super.onBackPressed()
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(detail: EBDeleteDetail) {
         val currentEntity = mAdapter.entityList?.find { it.id == detail.id }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt
index 5d2d551c9e..a79d0f88d9 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailActivity.kt
@@ -3,12 +3,16 @@ package com.gh.gamecenter.forum.detail
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import com.gh.base.BaseActivity
 import com.gh.common.util.DisplayUtils
 import com.gh.common.util.EntranceUtils
 import com.gh.gamecenter.R
 
 class ForumDetailActivity : BaseActivity() {
+
+    private var mContainerFragment: Fragment? = null
+
     override fun getLayoutId(): Int {
         return R.layout.activity_amway
     }
@@ -18,10 +22,10 @@ class ForumDetailActivity : BaseActivity() {
 
         DisplayUtils.transparentStatusBar(this)
 
-        val containerFragment = supportFragmentManager.findFragmentByTag(ForumDetailFragment::class.java.simpleName)
+        mContainerFragment = supportFragmentManager.findFragmentByTag(ForumDetailFragment::class.java.simpleName)
                 ?: ForumDetailFragment().with(intent.extras)
         // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移
-        supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, ForumDetailFragment::class.java.simpleName).commitAllowingStateLoss()
+        supportFragmentManager.beginTransaction().replace(R.id.placeholder, mContainerFragment!!, ForumDetailFragment::class.java.simpleName).commitAllowingStateLoss()
     }
 
     override fun getBusinessId(): Pair<String, String> {
@@ -37,4 +41,11 @@ class ForumDetailActivity : BaseActivity() {
             return intent
         }
     }
+
+    override fun handleBackPressed(): Boolean {
+        (mContainerFragment as? ForumDetailFragment)?.run {
+            return onBackPressed()
+        }
+        return super.handleBackPressed()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt
index 8ce6ba9f7e..4d38d95ce1 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt
@@ -546,6 +546,10 @@ class ForumDetailFragment : BaseLazyTabFragment() {
         mAllForumArticleAskListFragment?.insertDataToFirstIndex(entity)
     }
 
+    override fun onBackPressed(): Boolean {
+        return (mFragmentsList[mBinding.fragmentViewPager.currentItem] as ForumArticleAskListFragment).onBackPressed()
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(status: EBTypeChange) {
         if (status.type == EB_SHOW_QUESTION_BUTTON) {
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
index 800c1c6052..85a2ef6d9e 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
@@ -267,6 +267,15 @@ class CommunityHomeFragment : LazyFragment() {
         (mFragmentList[0] as? ForumArticleListFragment)?.insertDataToFirstIndex(entity)
     }
 
+    override fun onBackPressed(): Boolean {
+        mBinding?.viewPager?.run {
+            if (currentItem == 0) {
+                return (mFragmentList[0] as ForumArticleListFragment).onBackPressed()
+            }
+        }
+        return super.onBackPressed()
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(status: EBTypeChange) {
         if (status.type == CommunityFragment.EB_SHOW_QUESTION_BUTTON) {
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 e8126ca9de..a8473834d0 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
@@ -6,7 +6,6 @@ import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.AppExecutor
-import com.gh.common.constant.Constants
 import com.gh.common.iinterface.IScrollable
 import com.gh.common.util.*
 import com.gh.gamecenter.R
@@ -21,6 +20,7 @@ import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper.Companion.savePl
 import com.gh.gamecenter.qa.CommunityFragment
 import com.gh.gamecenter.qa.entity.ArticleEntity
 import com.gh.gamecenter.user.UserViewModel
+import com.gh.gamecenter.video.detail.CustomManager
 import com.google.android.material.appbar.AppBarLayout
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -250,6 +250,14 @@ class ForumArticleListFragment : LazyListFragment<ArticleEntity, ForumArticleLis
 
     override fun provideSyncAdapter(): ForumArticleListAdapter = provideListAdapter()
 
+    override fun onBackPressed(): Boolean {
+        mScrollCalculatorHelper?.currentPlayer?.run {
+            return (isIfCurrentIsFullscreen
+                    && CustomManager.backFromWindowFull(requireActivity(), getKey()))
+        }
+        return super.onBackPressed()
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(detail: EBDeleteDetail){
         mAdapter?.run {
diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
index 73075ce82d..6eda266212 100644
--- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
@@ -113,6 +113,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem
     private MainWrapperViewModel mViewModel;
     private MessageUnreadViewModel mMessageUnreadViewModel;
     private HomeVideoFragment homeVideoFragment;
+    private CommunityHomeFragment mCommunityHomeFragment;
     private String[] resAssets = {"lottie/tab_home.json", "lottie/tab_game.json", "lottie/tab_forum.json", "lottie/tab_video.json", "tab_mine.gif"};
 
     @Override
@@ -147,7 +148,8 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem
         videoArgs.putBoolean(EntranceUtils.KEY_IS_HOME_VIDEO, true);
         homeVideoFragment.setArguments(videoArgs);
 
-        fragments.add(new CommunityHomeFragment());
+        mCommunityHomeFragment = new CommunityHomeFragment();
+        fragments.add(mCommunityHomeFragment);
         fragments.add(homeVideoFragment);
 
         if (mViewModel.shouldHideVideoTab()) {
@@ -549,6 +551,10 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem
         if (homeVideoFragment.getCurrentFragment() != null) {
             return homeVideoFragment.getCurrentFragment().onHandleBackPressed();
         }
+
+        if (mViewPager.getCurrentItem() == INDEX_BBS) {
+            return mCommunityHomeFragment.onBackPressed();
+        }
         return false;
     }
 
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 24a7447025..57ba651669 100644
--- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
@@ -628,6 +628,15 @@ class UserHomeFragment : NormalFragment() {
         return bitmap
     }
 
+    override fun onBackPressed(): Boolean {
+        mHomeBinding?.viewpager?.run {
+            if (currentItem == 1) {
+                return (mFragmentList[1] as UserHistoryFragment).onBackPressed()
+            }
+        }
+        return super.onBackPressed()
+    }
+
     companion object {
         const val LOCATION = "个人主页"
     }
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 e1eda467d0..7e1bd9bde8 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
@@ -8,7 +8,6 @@ import android.widget.TextView
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.AppExecutor
-import com.gh.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.gamecenter.R
 import com.gh.gamecenter.baselist.ListAdapter
@@ -20,7 +19,6 @@ import com.gh.gamecenter.entity.PersonalHistoryEntity
 import com.gh.gamecenter.entity.RatingComment
 import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
-import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
 import com.gh.gamecenter.qa.answer.detail.SimpleAnswerDetailActivity
 import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
@@ -28,6 +26,7 @@ import com.gh.gamecenter.qa.entity.ArticleDetailEntity
 import com.gh.gamecenter.qa.entity.QuestionsDetailEntity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
+import com.gh.gamecenter.video.detail.CustomManager
 import com.halo.assistant.HaloApp
 
 class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewModel>() {
@@ -323,6 +322,14 @@ class UserHistoryFragment : ListFragment<PersonalHistoryEntity, UserHistoryViewM
         }
     }
 
+    override fun onBackPressed(): Boolean {
+        mScrollCalculatorHelper?.currentPlayer?.run {
+            return (isIfCurrentIsFullscreen
+                    && CustomManager.backFromWindowFull(requireActivity(), getKey()))
+        }
+        return super.onBackPressed()
+    }
+
     companion object {
         const val USER_ID = "user_id"
         const val SCENE = "scene"