...

app/src/main/java/com/base/scanqrclear/fcm/notification/NotificationUiUtil.kt

@@ -13,8 +13,6 @@ import androidx.core.graphics.drawable.IconCompat
 import com.base.scanqrclear.MyApplication
 import com.base.scanqrclear.R
 import com.base.scanqrclear.bean.EarthquakeBean
-import com.base.scanqrclear.bean.EarthquakeData
-import com.base.scanqrclear.bean.EarthquakeProperties
 import com.base.scanqrclear.bean.NotificationSendBean
 import com.base.scanqrclear.bean.NotificationSendBean.Companion.ACTION_ID_APP_PROCESS
 import com.base.scanqrclear.bean.NotificationSendBean.Companion.ACTION_ID_CLEAN_JUNK
@@ -297,6 +295,7 @@ object NotificationUiUtil {
                     R.id.tvDesc,
                     wenAn.second.replace("$", weatherBean.city)
                 )
+                bigRemoteViews.setTextViewText(R.id.tvBtn, btnList.random())
 
                 sendBean.smallRemoteViews = smallRemoteViews
                 sendBean.bigRemoteViews = bigRemoteViews

app/src/main/java/com/base/scanqrclear/ui/main/HistoryFragment.kt

@@ -206,6 +206,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
             uiRefresh.invoke()
         } else {
             viewModel.dataRefreshBack = {
+                if (isAdded && !isDetached) {
                     val activity = requireActivity() as MainActivity?
                     activity?.runOnUiThread {
                         uiRefresh.invoke()
@@ -224,6 +225,7 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
                 }
             }
         }
+    }
 
     private fun sortList(createList: List<ScanBean>): List<ScanBean> {
 

app/src/main/java/com/base/scanqrclear/ui/main/MainActivity.kt

@@ -74,7 +74,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
     override fun onResumeOneShoot() {
         super.onResumeOneShoot()
         val flag = changeLanguage()
-        if (flag) return
+        if (flag) {
+            return
+        }
 
         mainStartTimes++
     }
@@ -132,10 +134,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
 
         when (actionId) {
             ACTION_ID_STAY_SCAN, ACTION_ID_SCAN -> {
-//                val defaultTab = binding.tabLayout.getTabAt(0)
-//                defaultTab?.select()
-//                defaultTab?.setSelected()
             }
+
             else -> {
                 if (permission) {
                     var nameId = 0
@@ -183,7 +183,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             }
 
             override fun onPageSelected(position: Int) {
-
+                val defaultTab = binding.tabLayout.getTabAt(position)
+                defaultTab?.select()
+                defaultTab?.setSelected()
             }
         })
     }
@@ -207,7 +209,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         }
         binding.tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab?) {
-                tab?.setSelected()
+                tab?.let {
+                    it.setSelected()
+                    naviFragment(tab.id)
+                }
             }
 
             override fun onTabUnselected(tab: TabLayout.Tab?) {
@@ -219,17 +224,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             }
         })
 
-        val defaultTab = binding.tabLayout.getTabAt(0)
-        defaultTab?.select()
-        defaultTab?.setSelected()
+
     }
 
     private var isScanTabFirst: Boolean = true
     private fun naviFragment(id: Int) {
         if (binding.viewPager2.currentItem == id) return
+        LogEx.logDebug(TAG, "naviFragment id=$id")
+
         when (id) {
             0 -> {
-                LogEx.logDebug(TAG, "naviFragment 0")
                 binding.viewPager2.setCurrentItem(0, false)
 
                 if (tabCanShowAd()) {
@@ -251,7 +255,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             }
 
             1 -> {
-                LogEx.logDebug(TAG, "naviFragment 1")
                 binding.viewPager2.setCurrentItem(1, false)
                 val flag = !isScanTabFirst && tabCanShowAd() && AdConfigBean.adsConfigBean.scanTabShowAd
                 LogEx.logDebug(TAG, "flag=$flag")
@@ -275,7 +278,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             }
 
             2 -> {
-                LogEx.logDebug(TAG, "naviFragment 2")
                 binding.viewPager2.setCurrentItem(2, false)
                 if (tabCanShowAd()) {
                     AdsMgr.showInsert(this, false, object : AdsShowCallBack() {
@@ -296,7 +298,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
             }
 
             3 -> {
-                LogEx.logDebug(TAG, "naviFragment 3")
                 binding.viewPager2.setCurrentItem(3, false)
                 if (tabCanShowAd() && AdConfigBean.adsConfigBean.setTabShowAd) {
                     AdsMgr.showInsert(this, false, object : AdsShowCallBack() {
@@ -339,7 +340,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         val textView = customView?.findViewById<TextView>(R.id.tv_tab)
         LogEx.logDebug(TAG, "setSelected ${textView?.text}")
         textView?.setTextColor(Color.parseColor("#6473F8"))
-        naviFragment(this.id)
     }
 
     override fun configSystemBar() {