Merge branch 'fallenstardust:master' into master

mobile/src/main/java/cn/garymb/ygomobile/loader/CardKeyWord.java

@@ -81,7 +81,7 @@ public class CardKeyWord {
 
         //包含系列，或者包含名字、描述
         public NameFilter(@NonNull String word, boolean exclude, boolean onlyText) {
-            this.setcode = onlyText ? 0 : DataManager.get().getStringManager().getSetCode(word);
+            this.setcode = onlyText ? 0 : DataManager.get().getStringManager().getSetCode(word, true);
             this.exclude = exclude;
             this.word = word.toLowerCase(Locale.US);
             if(this.setcode > 0){

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java

@@ -410,7 +410,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
 
     private List<Card> queryList(String keyword) {
         // 获取关键词对应的 setcode
-        long setcode = DataManager.get().getStringManager().getSetCode(keyword);
+        long setcode = DataManager.get().getStringManager().getSetCode(keyword, true);
         // 从 cardManager 获取所有卡片
         SparseArray<Card> cards = cardManager.getAllCards();
         if (cards == null) {

mobile/src/main/java/ocgcore/StringManager.java

@@ -202,14 +202,21 @@ public class StringManager implements Closeable {
         return String.format("0x%x", key);
     }
 
-    public long getSetCode(String key) {
+    public long getSetCode(String key, boolean fuzzy) {
         for (int i = 0; i < mCardSets.size(); i++) {
             CardSet cardSet = mCardSets.get(i);
             String[] setNames = cardSet.getName().split("\\|");
+            if (fuzzy) {
+                if (setNames[0].contains(key)) {
+                    return cardSet.getCode();
+                }
+            } else {
                 if (setNames[0].equalsIgnoreCase(key)) {
                     return cardSet.getCode();
                 }
             }
+
+        }
         return 0;
     }