up

app/src/main/java/io/legado/app/data/dao/BookDao.kt

@@ -30,6 +30,9 @@ interface BookDao {
     @Query("select * from books where bookUrl = :bookUrl")
     fun getBook(bookUrl: String): Book?
 
+    @Query("select * from books order by durChapterTime desc limit 1")
+    fun getLastReadBook(): Book?
+
     @get:Query("SELECT bookUrl FROM books")
     val allBookUrls: List<String>
 

app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt

@@ -36,11 +36,15 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
     private val loadingLock = "loadingLock"
 
     fun initData(intent: Intent) {
+        execute {
             inBookshelf = intent.getBooleanExtra("inBookshelf", true)
             val bookUrl = intent.getStringExtra("bookUrl")
-        if (!bookUrl.isNullOrEmpty()) {
+            val book = if (!bookUrl.isNullOrEmpty()) {
-            execute {
+                App.db.bookDao().getBook(bookUrl)
-                App.db.bookDao().getBook(bookUrl)?.let { book ->
+            } else {
+                App.db.bookDao().getLastReadBook()
+            }
+            book?.let {
                 durChapterIndex = book.durChapterIndex
                 durPageIndex = book.durChapterPos
                 isLocalBook = book.origin == BookType.local
@@ -64,8 +68,6 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                     chapterListFinish.postValue(true)
                 }
             }
-
-            }
         }
     }