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 { @@ -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() { @@ -323,6 +322,14 @@ class UserHistoryFragment : ListFragment