From 8501277e06f6e2e7b88f6de65eec65b5646bf1f1 Mon Sep 17 00:00:00 2001
From: HuanChengFly <609486518@qq.com>
Date: Fri, 12 Feb 2021 13:39:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E8=A7=92=E6=A0=87?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/activities/MainActivity.kt     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
index df841b41..280e1376 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/MainActivity.kt
@@ -46,7 +46,7 @@ import com.huanchengfly.tieba.post.services.NotifyJobService
 import com.huanchengfly.tieba.post.utils.*
 import com.huanchengfly.tieba.post.widgets.MyViewPager
 
-open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemSelectedListener, OnNavigationItemReselectedListener {
+class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemSelectedListener, OnNavigationItemReselectedListener {
     var mAdapter: ViewPagerAdapter = ViewPagerAdapter(supportFragmentManager)
 
     @BindView(R.id.mViewPager)
@@ -58,11 +58,16 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS
 
     private var lastTime: Long = 0
     private val navigationHelper: NavigationHelper = NavigationHelper.newInstance(this)
-    private var hideExplore = false
     private var badgeTextView: TextView? = null
     private val newMessageReceiver: BroadcastReceiver = NewMessageReceiver()
     private val accountSwitchReceiver: BroadcastReceiver = AccountSwitchReceiver()
 
+    private val hideExplore
+        get() = appPreferences.hideExplore
+
+    private val msgNavPosition
+        get() = if (hideExplore) 1 else 2
+
     public override fun onResume() {
         val reason = ThemeUtil.getSharedPreferences(this).getString(ThemeUtil.SP_SWITCH_REASON, null)
         val followSystemNight = appPreferences.followSystemNight
@@ -104,11 +109,11 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS
                 return true
             }
             R.id.navbar_msg -> {
-                mViewPager.setCurrentItem(if (hideExplore) 1 else 2, false)
+                mViewPager.setCurrentItem(msgNavPosition, false)
                 return true
             }
             R.id.navbar_user -> {
-                mViewPager.setCurrentItem(if (hideExplore) 2 else 3, false)
+                mViewPager.setCurrentItem(msgNavPosition + 1, false)
                 return true
             }
         }
@@ -120,7 +125,7 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS
     }
 
     protected fun initView() {
-        val hideExploreItemView = menuView!!.getChildAt(if (hideExplore) 1 else 2) as BottomNavigationItemView
+        val hideExploreItemView = menuView!!.getChildAt(msgNavPosition) as BottomNavigationItemView
         val badge = layoutInflater.inflate(R.layout.layout_badge, hideExploreItemView, true)
         badgeTextView = badge.findViewById(R.id.tv_msg_count)
         if (hideExplore) {
@@ -146,9 +151,8 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS
 
             @SuppressLint("RestrictedApi")
             override fun onPageSelected(position: Int) {
-                val baseFragment = mAdapter.getItem(position)
                 mBottomNavigationView.menu.getItem(position).isChecked = true
-                if (position == (if (hideExplore) 1 else 2)) {
+                if (position == msgNavPosition) {
                     badgeTextView!!.visibility = View.GONE
                 }
             }
@@ -174,7 +178,6 @@ open class MainActivity : BaseActivity(), BottomNavigationView.OnNavigationItemS
         super.onCreate(savedInstanceState)
         setSwipeBackEnable(false)
         ThemeUtil.setTranslucentThemeBackground(findViewById(R.id.background))
-        hideExplore = appPreferences.hideExplore
         findView()
         initView()
         initListener()