up

app/src/main/AndroidManifest.xml

@@ -38,7 +38,9 @@
                 android:resource="@xml/shortcuts"
                 android:launchMode="singleTask" />
         </activity>
-        <activity android:name=".ui.main.MainActivity" />
+        <activity
+            android:name=".ui.main.MainActivity"
+            android:launchMode="singleTop" />
         <activity
             android:name=".ui.book.read.ReadBookActivity"
             android:configChanges="locale|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout"

app/src/main/java/io/legado/app/help/ActivityHelp.kt

@@ -1,6 +1,7 @@
 package io.legado.app.help
 
 import android.app.Activity
+import io.legado.app.utils.LogUtils
 import java.lang.ref.WeakReference
 import java.util.*
 
@@ -11,6 +12,11 @@ object ActivityHelp {
 
     private val activities: MutableList<WeakReference<Activity>> = arrayListOf()
 
+    fun size(): Int {
+        LogUtils.d("xxxx", activities.size.toString())
+        return activities.size
+    }
+
     /**
      * 判断指定Activity是否存在
      */

app/src/main/java/io/legado/app/ui/main/MainActivity.kt

@@ -12,6 +12,7 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.constant.Bus
+import io.legado.app.help.ActivityHelp
 import io.legado.app.help.permission.Permissions
 import io.legado.app.help.permission.PermissionsCompat
 import io.legado.app.lib.dialogs.alert
@@ -103,7 +104,22 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
         return super.onKeyUp(keyCode, event)
     }
 
-    private inner class TabFragmentPageAdapter internal constructor(fm: FragmentManager) :
+    override fun finish() {
+        if (ActivityHelp.size() > 1) {
+            moveTaskToBack(true)
+        } else {
+            super.finish()
+        }
+    }
+
+    override fun observeLiveBus() {
+        observeEvent<String>(Bus.RECREATE) {
+            recreate()
+        }
+    }
+}
+
+private class TabFragmentPageAdapter internal constructor(fm: FragmentManager) :
     FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     override fun getItem(position: Int): Fragment {
@@ -118,12 +134,4 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
     override fun getCount(): Int {
         return 4
     }
-
-    }
-
-    override fun observeLiveBus() {
-        observeEvent<String>(Bus.RECREATE) {
-            recreate()
-        }
-    }
 }