From 4621da97397113739a72ce09fa45751b84f07ed1 Mon Sep 17 00:00:00 2001
From: hingbong <hingbonglo@gmail.com>
Date: Fri, 17 Apr 2020 15:01:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=AD=E6=96=87=E7=AE=80=E7=B9=81?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BA=93=E6=8D=A2=E6=88=90=20HanLP=20?=
 =?UTF-8?q?=E6=9E=81=E5=A4=A7=E6=8F=90=E5=8D=87=E6=80=A7=E8=83=BD=E5=92=8C?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hingbong <hingbonglo@gmail.com>
---
 app/build.gradle                                            | 2 +-
 app/src/main/java/io/legado/app/help/BookHelp.kt            | 6 +++---
 .../java/io/legado/app/ui/book/read/page/ContentView.kt     | 6 +++---
 .../main/java/io/legado/app/ui/welcome/WelcomeActivity.kt   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1041b9d6c..6bd69f624 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -191,7 +191,7 @@ dependencies {
     implementation 'ru.noties.markwon:core:3.1.0'
 
     //转换繁体
-    implementation 'com.github.houbb:opencc4j:1.4.0'
+    implementation 'com.hankcs:hanlp:portable-1.7.7'
 
 }
 
diff --git a/app/src/main/java/io/legado/app/help/BookHelp.kt b/app/src/main/java/io/legado/app/help/BookHelp.kt
index 956b3f46b..514c5327c 100644
--- a/app/src/main/java/io/legado/app/help/BookHelp.kt
+++ b/app/src/main/java/io/legado/app/help/BookHelp.kt
@@ -1,6 +1,6 @@
 package io.legado.app.help
 
-import com.github.houbb.opencc4j.core.impl.ZhConvertBootstrap
+import com.hankcs.hanlp.HanLP
 import io.legado.app.App
 import io.legado.app.constant.EventBus
 import io.legado.app.data.entities.Book
@@ -233,8 +233,8 @@ object BookHelp {
         }
         try {
             when (AppConfig.chineseConverterType) {
-                1 -> c = ZhConvertBootstrap.newInstance().toSimple(c)
-                2 -> c = ZhConvertBootstrap.newInstance().toTraditional(c)
+                1 -> c = HanLP.convertToSimplifiedChinese(c)
+                2 -> c = HanLP.convertToTraditionalChinese(c)
             }
         } catch (e: Exception) {
             withContext(Main) {
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
index d87311f09..d38a924b4 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.graphics.drawable.Drawable
 import android.view.MotionEvent
 import android.widget.FrameLayout
-import com.github.houbb.opencc4j.core.impl.ZhConvertBootstrap
+import com.hankcs.hanlp.HanLP
 import io.legado.app.R
 import io.legado.app.constant.AppConst.timeFormat
 import io.legado.app.help.AppConfig
@@ -119,8 +119,8 @@ class ContentView(context: Context) : FrameLayout(context) {
     @SuppressLint("SetTextI18n")
     fun setProgress(textPage: TextPage) = textPage.apply {
         val title = when (AppConfig.chineseConverterType) {
-            1 -> ZhConvertBootstrap.newInstance().toSimple(textPage.title)
-            2 -> ZhConvertBootstrap.newInstance().toTraditional(textPage.title)
+            1 -> HanLP.convertToSimplifiedChinese(textPage.title)
+            2 -> HanLP.convertToTraditionalChinese(textPage.title)
             else -> textPage.title
         }
         if (ReadBookConfig.hideStatusBar) {
diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
index fdf77bc85..63455fc9a 100644
--- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
@@ -2,7 +2,7 @@ package io.legado.app.ui.welcome
 
 import android.content.Intent
 import android.os.Bundle
-import com.github.houbb.opencc4j.util.ZhConverterUtil
+import com.hankcs.hanlp.HanLP
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.BaseActivity
@@ -37,8 +37,8 @@ open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
                 .clearExpired(System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1))
             //初始化简繁转换引擎
             when (AppConfig.chineseConverterType) {
-                1 -> ZhConverterUtil.toSimple("初始化")
-                2 -> ZhConverterUtil.toTraditional("初始化")
+                1 -> HanLP.convertToSimplifiedChinese("初始化")
+                2 -> HanLP.convertToTraditionalChinese("初始化")
                 else -> null
             }
         }