From 585c19f7a729a113a7a65ebac83d36a982f13f16 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sat, 17 Aug 2019 21:04:06 +0800
Subject: [PATCH] up

---
 .../app/model/webbook/BookChapterList.kt      |  2 +-
 .../legado/app/model/webbook/BookContent.kt   |  2 +-
 .../io/legado/app/model/webbook/BookInfo.kt   |  2 +-
 .../io/legado/app/model/webbook/BookList.kt   |  2 +-
 .../app/ui/bookinfo/BookInfoActivity.kt       | 12 ++++++-
 .../app/ui/bookinfo/BookInfoViewModel.kt      | 27 +++++++++++++---
 .../app/ui/readbook/ReadBookViewModel.kt      |  4 +--
 app/src/main/res/values/strings.xml           | 32 ++++++++++++-------
 8 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt b/app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt
index c387008a7..03e29ea95 100644
--- a/app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt
+++ b/app/src/main/java/io/legado/app/model/webbook/BookChapterList.kt
@@ -28,7 +28,7 @@ object BookChapterList {
         val body: String? = response.body()
         body ?: throw Exception(
             App.INSTANCE.getString(
-                R.string.get_web_content_error,
+                R.string.error_get_web_content,
                 baseUrl
             )
         )
diff --git a/app/src/main/java/io/legado/app/model/webbook/BookContent.kt b/app/src/main/java/io/legado/app/model/webbook/BookContent.kt
index 0b77b10a4..bfa7f76a3 100644
--- a/app/src/main/java/io/legado/app/model/webbook/BookContent.kt
+++ b/app/src/main/java/io/legado/app/model/webbook/BookContent.kt
@@ -29,7 +29,7 @@ object BookContent {
         val body: String? = response.body()
         body ?: throw Exception(
             App.INSTANCE.getString(
-                R.string.get_web_content_error,
+                R.string.error_get_web_content,
                 baseUrl
             )
         )
diff --git a/app/src/main/java/io/legado/app/model/webbook/BookInfo.kt b/app/src/main/java/io/legado/app/model/webbook/BookInfo.kt
index d3d043a0b..05dfc0fc6 100644
--- a/app/src/main/java/io/legado/app/model/webbook/BookInfo.kt
+++ b/app/src/main/java/io/legado/app/model/webbook/BookInfo.kt
@@ -19,7 +19,7 @@ object BookInfo {
         val baseUrl = analyzeUrl.url
         body ?: throw Exception(
             App.INSTANCE.getString(
-                R.string.get_web_content_error,
+                R.string.error_get_web_content,
                 baseUrl
             )
         )
diff --git a/app/src/main/java/io/legado/app/model/webbook/BookList.kt b/app/src/main/java/io/legado/app/model/webbook/BookList.kt
index b5af7027f..4ee99bb7c 100644
--- a/app/src/main/java/io/legado/app/model/webbook/BookList.kt
+++ b/app/src/main/java/io/legado/app/model/webbook/BookList.kt
@@ -24,7 +24,7 @@ object BookList {
         val body: String? = response.body()
         body ?: throw Exception(
             App.INSTANCE.getString(
-                R.string.get_web_content_error,
+                R.string.error_get_web_content,
                 baseUrl
             )
         )
diff --git a/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoActivity.kt
index f0e3215c8..058fbe950 100644
--- a/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoActivity.kt
@@ -12,6 +12,7 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.ImageLoader
 import io.legado.app.ui.bookinfo.edit.BookInfoEditActivity
 import io.legado.app.ui.changesource.ChangeSourceDialog
+import io.legado.app.ui.readbook.ReadBookActivity
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.gone
 import io.legado.app.utils.visible
@@ -105,6 +106,7 @@ class BookInfoActivity : VMBaseActivity<BookInfoViewModel>(R.layout.activity_boo
     }
 
     private fun showChapter(chapterList: List<BookChapter>) {
+
         adapter.clearItems()
         adapter.addItems(chapterList)
     }
@@ -130,7 +132,15 @@ class BookInfoActivity : VMBaseActivity<BookInfoViewModel>(R.layout.activity_boo
 
     private fun initOnClick() {
         tv_read.onClick {
-
+            viewModel.bookData.value?.let {
+                if (!viewModel.inBookshelf) {
+                    viewModel.saveBook {
+                        startActivity<ReadBookActivity>(Pair("bookUrl", it.bookUrl))
+                    }
+                } else {
+                    startActivity<ReadBookActivity>(Pair("bookUrl", it.bookUrl))
+                }
+            }
         }
         tv_shelf.onClick {
             viewModel.saveBook {
diff --git a/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoViewModel.kt
index 7efde2b00..8958c84d1 100644
--- a/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/bookinfo/BookInfoViewModel.kt
@@ -4,9 +4,12 @@ import android.app.Application
 import android.content.Intent
 import androidx.lifecycle.MutableLiveData
 import io.legado.app.App
+import io.legado.app.R
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
+import io.legado.app.model.WebBook
+import kotlinx.coroutines.Dispatchers.IO
 
 class BookInfoViewModel(application: Application) : BaseViewModel(application) {
 
@@ -32,7 +35,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                 App.db.searchBookDao().getSearchBook(it)?.toBook()?.let { book ->
                     bookData.postValue(book)
                     if (book.tocUrl.isEmpty()) {
-                        loadBookInfo()
+                        loadBookInfo(book)
                     } else {
                         loadChapter(book)
                     }
@@ -41,15 +44,31 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    fun loadBookInfo() {
+    fun loadBookInfo(book: Book) {
         isLoadingData.postValue(false)
+        App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
+            WebBook(bookSource).getBookInfo(book)
+                .onSuccess {
+                    it?.let { loadChapter(it) }
+                }.onError {
+                    toast(R.string.error_get_book_info)
+                }
+        } ?: toast(R.string.error_no_source)
     }
 
     fun loadChapter(book: Book) {
         isLoadingData.postValue(false)
-        App.db.bookSourceDao().getBookSource(book.origin)?.let {
+        App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
+            WebBook(bookSource).getChapterList(book)
+                .onSuccess(IO) {
+                    if (inBookshelf) {
 
-        }
+                    }
+                    chapterListData.postValue(it)
+                }.onError {
+                    toast(R.string.error_get_chapter_list)
+                }
+        } ?: toast(R.string.error_no_source)
     }
 
     fun saveBook(success: (() -> Unit)?) {
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 a19467341..7ed316cfc 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
@@ -53,10 +53,10 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                                     App.db.bookChapterDao().insert(*cList.toTypedArray())
                                     chapterMaxIndex.postValue(cList.size)
                                 } else {
-                                    toast(R.string.load_toc_error)
+                                    toast(R.string.error_load_toc)
                                 }
                             }?.onError {
-                                toast(R.string.load_toc_error)
+                                toast(R.string.error_load_toc)
                             } ?: autoChangeSource()
                     } else {
                         chapterMaxIndex.postValue(count)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51172e3ed..8a70911dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,9 +59,6 @@
     <string name="version">版本</string>
     <string name="local">本地</string>
     <string name="search">搜索</string>
-    <string name="net_error_10001">没有网络</string>
-    <string name="net_error_10002">网络连接超时</string>
-    <string name="net_error_10003">数据解析失败</string>
     <string name="origin_format">来源: %s</string>
     <string name="read_dur_progress">最近: %s</string>
     <string name="book_name">书名</string>
@@ -69,7 +66,6 @@
     <string name="check_add_bookshelf">是否将《%s》放入书架？</string>
     <string name="import_books_count">共%s个Text文件</string>
     <string name="is_loading">加载中…</string>
-    <string name="get_data_error">获取数据失败！</string>
     <string name="retry">重试</string>
     <string name="web_service">web服务</string>
     <string name="web_edit_source">web编辑书源</string>
@@ -142,7 +138,6 @@
     <string name="background">背景</string>
     <string name="author">作者</string>
     <string name="author_show">作者:%s</string>
-    <string name="analyze_error">站点暂时不支持解析，请反馈</string>
     <string name="aloud_stop">朗读停止</string>
     <string name="clear_cache">清除缓存</string>
     <string name="action_save">保存</string>
@@ -347,6 +342,7 @@
     <string name="success">成功</string>
     <string name="source_no_login">当前源没有配置登陆地址</string>
 
+    <!-- book source start-->
     <string name="book_source_name">书源名称(bookSourceName)</string>
     <string name="book_source_url">书源URL(bookSourceUrl)</string>
     <string name="book_source_group">书源分组(bookSourceGroup)</string>
@@ -371,6 +367,23 @@
     <string name="rule_chapter_url">章节URL规则(chapterUrl)</string>
     <string name="rule_book_content">正文规则(content)</string>
     <string name="rule_content_url_next">正文下一页URL规则(nextContentUrl)</string>
+    <!--book source end-->
+
+    <!--error string start-->
+    <string name="error_no_source">没有书源</string>
+    <string name="error_get_book_info">书籍信息获取失败</string>
+    <string name="error_get_content">内容获取失败</string>
+    <string name="error_get_chapter_list">目录获取失败</string>
+    <string name="error_get_web_content">访问网站失败:%s</string>
+    <string name="error_read_file">文件读取失败</string>
+    <string name="error_load_toc">加载目录失败</string>
+    <string name="error_get_data">获取数据失败！</string>
+    <string name="error_load_msg">加载失败\n%s</string>
+    <string name="net_error_10001">没有网络</string>
+    <string name="net_error_10002">网络连接超时</string>
+    <string name="net_error_10003">数据解析失败</string>
+    <!--error string end-->
+
     <string name="source_http_header">header</string>
     <string name="debug_source">调试书源</string>
     <string name="import_by_qr_code">二维码导入</string>
@@ -382,7 +395,6 @@
     <string name="default_theme">默认主题</string>
     <string name="restore_default_theme">恢复主题为默认配色</string>
     <string name="join_qq_group">加入QQ群</string>
-    <string name="read_file_error">文件读取失败</string>
     <string name="bg_image_per">获取背景图片需存储权限</string>
     <string name="input_book_source_url">输入书源网址</string>
     <string name="del_file">删除文件</string>
@@ -408,10 +420,6 @@
     <string name="input_charset">输入编码</string>
     <string name="text_chapter_list_rule">TXT目录规则</string>
     <string name="open_local_book_per">打开外部书籍需获取存储权限</string>
-    <string name="get_book_info_error">书籍信息获取失败</string>
-    <string name="get_content_error">内容获取失败</string>
-    <string name="get_chapter_list_error">目录获取失败</string>
-    <string name="get_web_content_error">访问网站失败:%s</string>
     <string name="no_book_name">未获取到书名</string>
     <string name="input_replace_url">输入替换规则网址</string>
     <string name="get_book_list_success">搜索列表获取成功%d</string>
@@ -439,7 +447,6 @@
     <string name="content_empty">文章内容为空</string>
     <string name="on_change_source">正在换源请等待…</string>
     <string name="chapter_list_empty">目录列表为空</string>
-    <string name="load_error_msg">加载失败\n%s</string>
     <string name="content_padding">正文边距</string>
     <string name="tip_padding">Tip边距</string>
     <string name="text_letter_spacing">字距</string>
@@ -474,5 +481,6 @@
     <string name="dsm_start"><![CDATA[<]]></string>
     <string name="dsm_end"><![CDATA[>]]></string>
     <string name="reading">阅读</string>
-    <string name="load_toc_error">加载目录失败</string>
+
+
 </resources>