From 8b04753f6a0b2379a3f9301a0e0fb5ea2ea3639d Mon Sep 17 00:00:00 2001
From: wangbinbin <wangbinbin@piesat.cn>
Date: Fri, 29 Nov 2019 10:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/novel/read/activity/NovelBookDetailActivity.kt | 10 +++++-----
 app/src/main/java/com/novel/read/utlis/SpUtil.java     |  2 +-
 app/src/main/java/com/novel/read/utlis/StringUtils.kt  |  2 +-
 app/src/main/res/values-night/strings.xml              |  1 +
 app/src/main/res/values-zh-rTW-night/strings.xml       |  1 +
 app/src/main/res/values-zh-rTW/strings.xml             |  1 +
 app/src/main/res/values/strings.xml                    |  1 +
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/novel/read/activity/NovelBookDetailActivity.kt b/app/src/main/java/com/novel/read/activity/NovelBookDetailActivity.kt
index b6645a2..c526aa7 100644
--- a/app/src/main/java/com/novel/read/activity/NovelBookDetailActivity.kt
+++ b/app/src/main/java/com/novel/read/activity/NovelBookDetailActivity.kt
@@ -3,6 +3,7 @@ package com.novel.read.activity
 import android.annotation.SuppressLint
 import android.app.ProgressDialog
 import android.content.Intent
+import android.util.Log
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mango.mangolib.event.EventManager
@@ -39,8 +40,7 @@ class NovelBookDetailActivity : NovelBaseActivity(), View.OnClickListener {
 
     private var mProgressDialog: ProgressDialog? = null
 
-    override val layoutId: Int
-        get() = R.layout.activity_book_detail
+    override val layoutId: Int get() = R.layout.activity_book_detail
 
     override fun initView() {
         mBookId = intent.getIntExtra(Constant.Bundle.BookId, 0)
@@ -120,7 +120,7 @@ class NovelBookDetailActivity : NovelBaseActivity(), View.OnClickListener {
             if (mCollBookBean != null) {
                 isCollected = true
                 tv_add_book.text = resources.getString(R.string.already_add)
-                tv_start_read.text = "继续阅读"
+                tv_start_read.text = resources.getString(R.string.go_read)
             } else {
                 mCollBookBean = event.result!!.collBookBean
             }
@@ -130,7 +130,7 @@ class NovelBookDetailActivity : NovelBaseActivity(), View.OnClickListener {
     @Subscribe
     fun getRecommendBook(event: GetRecommendBookEvent) {
         if (event.isFail) {
-
+            Log.e("getRecommendBook", event.er?.msg)
         } else {
             mList.clear()
             mList.addAll(event.result!!.book)
@@ -202,7 +202,7 @@ class NovelBookDetailActivity : NovelBaseActivity(), View.OnClickListener {
 
             if (isCollected) {
                 tv_add_book.text = resources.getString(R.string.already_add)
-                tv_start_read.text = "继续阅读"
+                tv_start_read.text = resources.getString(R.string.go_read)
             }
         }
     }
diff --git a/app/src/main/java/com/novel/read/utlis/SpUtil.java b/app/src/main/java/com/novel/read/utlis/SpUtil.java
index 584ecc6..f93ea5f 100644
--- a/app/src/main/java/com/novel/read/utlis/SpUtil.java
+++ b/app/src/main/java/com/novel/read/utlis/SpUtil.java
@@ -100,7 +100,7 @@ public class SpUtil {
     }
 
     public int getSelectLanguage() {
-        return getIntValue(TAG_LANGUAGE, 1);
+        return getIntValue(TAG_LANGUAGE, 0);
     }
 
     public Locale getSystemCurrentLocal() {
diff --git a/app/src/main/java/com/novel/read/utlis/StringUtils.kt b/app/src/main/java/com/novel/read/utlis/StringUtils.kt
index 0c8a5a4..82cc46e 100644
--- a/app/src/main/java/com/novel/read/utlis/StringUtils.kt
+++ b/app/src/main/java/com/novel/read/utlis/StringUtils.kt
@@ -54,7 +54,7 @@ object StringUtils {
 
     //繁簡轉換
     fun convertCC(input: String): String {
-        val convertType = SpUtil.getIntValue(SHARED_READ_CONVERT_TYPE, 1)
+        val convertType = SpUtil.getIntValue(SHARED_READ_CONVERT_TYPE, 0)
 
         if (input.isEmpty())
             return ""
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
index 2857c46..0d92ef1 100644
--- a/app/src/main/res/values-night/strings.xml
+++ b/app/src/main/res/values-night/strings.xml
@@ -49,6 +49,7 @@
     <string name="book_detail">图书详情</string>
     <string name="lovely">猜你喜欢</string>
     <string name="already_add">已加入</string>
+    <string name="go_read">继续阅读</string>
     <string name="add_book">加入书架</string>
     <string name="start_read">开始阅读</string>
     <string name="popularity">人气</string>
diff --git a/app/src/main/res/values-zh-rTW-night/strings.xml b/app/src/main/res/values-zh-rTW-night/strings.xml
index 2bb5f88..4eb09d1 100644
--- a/app/src/main/res/values-zh-rTW-night/strings.xml
+++ b/app/src/main/res/values-zh-rTW-night/strings.xml
@@ -46,6 +46,7 @@
     <string name="book_detail">圖書詳情</string>
     <string name="lovely">猜妳喜歡</string>
     <string name="already_add">已加入</string>
+    <string name="go_read">继续閱讀</string>
     <string name="add_book">加入書架</string>
     <string name="start_read">開始閱讀</string>
     <string name="popularity">人氣</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index bfcc851..4f107d8 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -46,6 +46,7 @@
     <string name="book_detail">圖書詳情</string>
     <string name="lovely">猜妳喜歡</string>
     <string name="already_add">已加入</string>
+    <string name="go_read">继续閱讀</string>
     <string name="add_book">加入書架</string>
     <string name="start_read">開始閱讀</string>
     <string name="popularity">人氣</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd3afbc..b50bbf0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,6 +49,7 @@
     <string name="book_detail">图书详情</string>
     <string name="lovely">猜你喜欢</string>
     <string name="already_add">已加入</string>
+    <string name="go_read">继续阅读</string>
     <string name="add_book">加入书架</string>
     <string name="start_read">开始阅读</string>
     <string name="popularity">人气</string>