feat: search with traditional chinese

add lib opencc4j
isHarryh · Jan 20, 2025 · b2d734d · b2d734d
1 parent a43d795
commit b2d734d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,5 +74,7 @@ project(":core") {
         api "apache-log4j:log4j:1.2.15"
         // TiniPinyin
         api 'com.github.promeg:tinypinyin:2.0.3'
+        // OpenCC4j
+        api 'com.github.houbb:opencc4j:1.8.1'
     }
 }
diff --git a/core/src/cn/harryh/arkpets/assets/ModelItem.java b/core/src/cn/harryh/arkpets/assets/ModelItem.java
@@ -87,8 +87,8 @@ public String getPinyinQuanpin() {
     @JSONField(serialize = false)
     public String getPinyinSuoxie() {
         if (pinyinSuoxie == null) {
-            String quanpin = Pinyin.toPinyin(name, " ");
-            if (!quanpin.trim().isEmpty()) {
+            String quanpin = Pinyin.toPinyin(name, " ").trim();
+            if (!quanpin.isEmpty()) {
                 StringBuilder builder = new StringBuilder();
                 for (String word : quanpin.split("\\s+")) {
                     builder.append(word.charAt(0));

diff --git a/core/src/cn/harryh/arkpets/assets/ModelItemGroup.java b/core/src/cn/harryh/arkpets/assets/ModelItemGroup.java
@@ -4,6 +4,7 @@
 package cn.harryh.arkpets.assets;
 
 import cn.harryh.arkpets.assets.ModelItem.PropertyExtractor;
+import com.github.houbb.opencc4j.util.ZhConverterUtil;
 
 import java.util.*;
 import java.util.function.Predicate;
@@ -45,7 +46,7 @@ public ModelItemGroup() {
     public ModelItemGroup searchByKeyWords(String keyWords) {
         if (keyWords == null || keyWords.isEmpty())
             return this;
-        String[] wordList = keyWords.toUpperCase().split(" ");
+        String[] wordList = ZhConverterUtil.toSimple(keyWords).toUpperCase().split(" ");
         ModelItemGroup result = new ModelItemGroup();
 
         // Rule: match name