From 4fb7b6cd30fac335c957f33074048cf7fbb6149f Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 27 Aug 2019 12:35:07 +0800
Subject: [PATCH] up

---
 .../app/ui/readbook/ReadBookActivity.kt       | 12 ++++++++++
 .../app/ui/readbook/ReadBookViewModel.kt      | 23 +++++--------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt
index b71102df7..f447221b6 100644
--- a/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt
@@ -61,6 +61,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_rea
         page_view.callback = this
         viewModel.callBack = this
         viewModel.bookData.observe(this, Observer { title_bar.title = it.name })
+        viewModel.chapterListFinish.observe(this, Observer { bookLoadFinish() })
         viewModel.initData(intent)
         savedInstanceState?.let {
             changeSourceDialog =
@@ -224,6 +225,17 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_rea
         return super.onKeyDown(keyCode, event)
     }
 
+    /**
+     * 书籍加载完成,开始加载章节内容
+     */
+    private fun bookLoadFinish() {
+        viewModel.bookData.value?.let {
+            viewModel.loadContent(it, viewModel.durChapterIndex)
+            viewModel.loadContent(it, viewModel.durChapterIndex + 1)
+            viewModel.loadContent(it, viewModel.durChapterIndex - 1)
+        }
+    }
+
     /**
      * 加载章节内容
      */
diff --git a/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt
index 5b62ba8f1..83605f9cd 100644
--- a/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt
@@ -21,6 +21,7 @@ import kotlinx.coroutines.launch
 class ReadBookViewModel(application: Application) : BaseViewModel(application) {
     var inBookshelf = false
     var bookData = MutableLiveData<Book>()
+    val chapterListFinish = MutableLiveData<Boolean>()
     var chapterSize = 0
     var bookSource: BookSource? = null
     var callBack: CallBack? = null
@@ -60,7 +61,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                             durChapterIndex = count - 1
                         }
                         chapterSize = count
-                        loadChapterListFinish()
+                        chapterListFinish.postValue(true)
                     }
                 }
 
@@ -84,7 +85,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                     if (!cList.isNullOrEmpty()) {
                         App.db.bookChapterDao().insert(*cList.toTypedArray())
                         chapterSize = cList.size
-                        loadChapterListFinish()
+                        chapterListFinish.postValue(true)
                     } else {
                         toast(R.string.error_load_toc)
                     }
@@ -94,14 +95,6 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    private fun loadChapterListFinish() {
-        bookData.value?.let {
-            loadContent(it, durChapterIndex)
-            loadContent(it, durChapterIndex + 1)
-            loadContent(it, durChapterIndex - 1)
-        }
-    }
-
     fun loadContent(book: Book, index: Int) {
         synchronized(loadingLock) {
             if (loadingChapters.contains(index)) return
@@ -125,7 +118,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    fun download(book: Book, index: Int) {
+    private fun download(book: Book, index: Int) {
         synchronized(loadingLock) {
             if (loadingChapters.contains(index)) return
             loadingChapters.add(index)
@@ -200,19 +193,15 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
             durPageIndex = 0
         }
         saveRead()
-        loadChapterListFinish()
+        chapterListFinish.postValue(true)
     }
 
     fun saveRead() {
         execute {
             bookData.value?.let { book ->
-                book.durChapterTime = System.currentTimeMillis()
                 book.durChapterIndex = durChapterIndex
                 book.durChapterPos = durPageIndex
-                curTextChapter?.let {
-                    book.durChapterTitle = it.title
-                    App.db.bookDao().update(book)
-                }
+                App.db.bookDao().update(book)
             }
         }
     }