Merge pull request #172 from jwyxym/master

新增更改关键词的搜索分隔方式

mobile/src/main/java/cn/garymb/ygomobile/AppsSettings.java

@@ -18,6 +18,7 @@ import static cn.garymb.ygomobile.Constants.DEF_PREF_KEEP_SCALE;
 import static cn.garymb.ygomobile.Constants.DEF_PREF_NOTCH_HEIGHT;
 import static cn.garymb.ygomobile.Constants.DEF_PREF_ONLY_GAME;
 import static cn.garymb.ygomobile.Constants.DEF_PREF_READ_EX;
+import static cn.garymb.ygomobile.Constants.PREF_DEF_KEY_WORDS_SPLIT;
 import static cn.garymb.ygomobile.Constants.PREF_DEF_DATA_LANGUAGE;
 import static cn.garymb.ygomobile.Constants.PREF_DEF_IMMERSIVE_MODE;
 import static cn.garymb.ygomobile.Constants.PREF_DEF_SENSOR_REFRESH;
@@ -380,6 +381,24 @@ public class AppsSettings {
         mSharedPreferences.putString(Constants.PREF_IMAGE_QUALITY, "" + quality);
     }
 
+    /***
+     * 关键字分隔方法
+     */
+    public void setKeyWordsSplit(int split) {
+        mSharedPreferences.putString(Constants.PREF_KEY_WORDS_SPLIT, "" + split);
+    }
+
+    /***
+     * 关键字分隔方法
+     */
+    public int getKeyWordsSplit() {
+        try {
+            return Integer.valueOf(mSharedPreferences.getString(Constants.PREF_KEY_WORDS_SPLIT, "" + PREF_DEF_KEY_WORDS_SPLIT));
+        } catch (Exception e) {
+            return PREF_DEF_KEY_WORDS_SPLIT;
+        }
+    }
+
     /***
      * 资料语言
      */
@@ -765,6 +784,19 @@ public class AppsSettings {
         }
     }
 
+    public enum keyWordsSplitEnum {
+        Space(0, "Space"),
+        Percent(1, "%%");
+
+        public Integer code;
+        public String name;
+
+        keyWordsSplitEnum(Integer code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+    }
+
     public enum languageEnum {
         //todo 逐步将设置语言的代码都更改为languageEnum
         Chinese(0, "zh"),

mobile/src/main/java/cn/garymb/ygomobile/Constants.java

@@ -22,6 +22,8 @@ public interface Constants {
     int PREF_DEF_IMAGE_QUALITY = 1;
     String PREF_DATA_LANGUAGE = "pref_key_game_data_language";
     int PREF_DEF_DATA_LANGUAGE = -1;
+    String PREF_KEY_WORDS_SPLIT = "pref_key_words_split";
+    int PREF_DEF_KEY_WORDS_SPLIT = -1;
     String PREF_GAME_FONT = "pref_key_game_font_name";
     String PREF_USE_EXTRA_CARD_CARDS = "settings_game_diy_card_db";
     boolean PREF_DEF_USE_EXTRA_CARD_CARDS = true;

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

 package cn.garymb.ygomobile.loader;
 
+import cn.garymb.ygomobile.AppsSettings;
+
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -26,6 +28,9 @@ public class CardKeyWord {
                 filterList.add(new CodeFilter(Long.parseLong(word)));
             } else {
                 String[] ws = word.split(" ");
+                if (AppsSettings.get().getKeyWordsSplit() == AppsSettings.keyWordsSplitEnum.Percent.code) {
+                    ws = word.split("%%");
+                }
                 for (String w : ws) {
                     if (TextUtils.isEmpty(w)) {
                         continue;

mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java

@@ -13,6 +13,7 @@ import static cn.garymb.ygomobile.Constants.ORI_REPLAY;
 import static cn.garymb.ygomobile.Constants.PERF_TEST_REPLACE_KERNEL;
 import static cn.garymb.ygomobile.Constants.PREF_CHANGE_LOG;
 import static cn.garymb.ygomobile.Constants.PREF_CHECK_UPDATE;
+import static cn.garymb.ygomobile.Constants.PREF_KEY_WORDS_SPLIT;
 import static cn.garymb.ygomobile.Constants.PREF_DATA_LANGUAGE;
 import static cn.garymb.ygomobile.Constants.PREF_DECK_DELETE_DILAOG;
 import static cn.garymb.ygomobile.Constants.PREF_DEL_EX;
@@ -150,6 +151,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
         bind(PREF_DEL_EX, getString(R.string.about_delete_ex));
         bind(PERF_TEST_REPLACE_KERNEL, "需root权限，请在开发者的指导下食用");
         bind(PREF_WINDOW_TOP_BOTTOM, "" + mSettings.getScreenPadding());
+        bind(PREF_KEY_WORDS_SPLIT, mSettings.getKeyWordsSplit());
         bind(PREF_DATA_LANGUAGE, mSettings.getDataLanguage());
         Preference preference = findPreference(PREF_READ_EX);
         if (preference != null) {
@@ -580,6 +582,12 @@ public class SettingFragment extends PreferenceFragmentPlus {
                 if (new File(fonts).list() != null)
                     FileUtils.delFile(fonts);
                 IOUtils.copyFilesFromAssets(getContext(), getDatapath(Constants.FONT_DIRECTORY), mSettings.getFontDirPath(), true);
+                //选择搜索时的关键字分隔方法
+                if (mSettings.getKeyWordsSplit() == -1) {//如果设置则为空格
+                    mSettings.setKeyWordsSplit(AppsSettings.keyWordsSplitEnum.Space.code);
+                } else {
+                    mSettings.setKeyWordsSplit(mSettings.getKeyWordsSplit());
+                }
                 //根据系统语言复制特定资料文件
                 if (mSettings.getDataLanguage() == -1) {//如果未在App中指定语言，则查询系统语言并进行设置
                     String language = getContext().getResources().getConfiguration().locale.getLanguage();

mobile/src/main/res/values-es/strings.xml

@@ -97,6 +97,10 @@
         <item>Español</item>
         <item>Japonés</item>
     </string-array>
+    <string-array name="key_words_split" translatable="false">
+        <item>(Space)</item>
+        <item>%%</item>
+    </string-array>
     <string-array name="screen_top_bottom_desc" translatable="false">
         <item>Deshabilitado</item>
         <item>5</item>
@@ -361,6 +365,7 @@
     <string name="login_succeed">Inicio de sesión exitoso</string>
     <string name="reChatJoining">Volver a iniciar sesión...</string>
     <string name="settings_data_language">Elegir Idioma</string>
+    <string name="settings_key_words_split">更改关键词搜索分隔方式</string>
     <string name="settings_data_language_about">Cambiar el idioma de la interfaz de usuario de YGOMobile y la base de datos de las cartas</string>
     <string name="find_in_page">Buscar: </string>
     <string name="tip_card_info_diff">Esta carta no está incluida en YGOMobile. Intente actualizar YGOMobile o verifique si la carta está disponible en el paquete de cartas de expansión.</string>

mobile/src/main/res/values-jp/strings.xml

@@ -89,6 +89,10 @@
         <item>Español</item>
         <item>日本語</item>
     </string-array>
+    <string-array name="key_words_split" translatable="false">
+        <item>(Space)</item>
+        <item>%%</item>
+    </string-array>
     <!-- settings -->
     <string name="server_list">ヂュエル</string>
     <string name="server_name">サーバー名:</string>
@@ -356,6 +360,7 @@
     <string name="login_succeed">登録成功</string>
     <string name="reChatJoining">接続は切断された,最接続中……</string>
     <string name="settings_data_language">言語を変更します</string>
+    <string name="settings_key_words_split">更改关键词搜索分隔方式</string>
     <string name="settings_data_language_about">YGOPROのUI、説明文やテキストを切り替えます</string>
     <string name="tip_card_info_diff">未確認カードです。ソフトを更新してくださいまたは非公式データを更新してください。</string>
     <string name="tip_deckInfo_isNot_completeDeck">デッキ解析異常，オフィシャルパスコードに変更してください</string>

mobile/src/main/res/values-ko/strings.xml

@@ -89,6 +89,10 @@
         <item>Español</item>
         <item>日本語</item>
     </string-array>
+    <string-array name="key_words_split" translatable="false">
+        <item>(Space)</item>
+        <item>%%</item>
+    </string-array>
     <!-- settings -->
     <string name="server_list">다이렉트 듀얼</string>
     <string name="server_name">이름:</string>
@@ -355,6 +359,7 @@
     <string name="login_succeed">채팅 방에 로그인되었습니다</string>
     <string name="reChatJoining">다시 로그인 중\.\.\.</string>
     <string name="settings_data_language">언어</string>
+    <string name="settings_key_words_split">更改关键词搜索分隔方式</string>
     <string name="settings_data_language_about">게임 데이터 언어를 변경합니다.</string>
     <string name="find_in_page">" 발견:"</string>
     <string name="tip_card_info_diff">몇몇 특수한 카드들을 제외하고 8자리 코드번호를 초과하는 카드들은 프리릴리즈 카드로, 프리릴리즈카드를 허용하는 서버 에서만 사용이 가능합니다.</string>

mobile/src/main/res/values-zh/strings.xml

@@ -89,6 +89,10 @@
         <item>Español</item>
         <item>日本語</item>
     </string-array>
+    <string-array name="key_words_split" translatable="false">
+        <item>(Space)</item>
+        <item>%%</item>
+    </string-array>
     <!-- settings -->
     <string name="server_list">联机对战</string>
     <string name="server_name">名称:</string>
@@ -356,6 +360,7 @@
     <string name="login_succeed">登录成功</string>
     <string name="reChatJoining">连接断开,重新登陆中……</string>
     <string name="settings_data_language">切换资料语言</string>
+    <string name="settings_key_words_split">更改关键词搜索分隔方式</string>
     <string name="settings_data_language_about">切换ygopro界面和效果说明文字等的语言</string>
     <string name="tip_card_info_diff">软件未收录此卡。请尝试更新软件，或查看扩展卡包中是否有此卡。</string>
     <string name="tip_deckInfo_isNot_completeDeck">当前卡组解析异常，将尽量转换为已有卡片</string>

mobile/src/main/res/values/arrays.xml

@@ -16,6 +16,10 @@
         <item>3</item>
         <item>4</item>
     </string-array>
+    <string-array name="key_words_split_value" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
     <string-array name="screen_top_bottom_value"  translatable="false">
         <item>0</item>
         <item>5</item>

mobile/src/main/res/values/strings.xml

@@ -98,6 +98,10 @@
         <item>Español</item>
         <item>日本語</item>
     </string-array>
+    <string-array name="key_words_split" translatable="false">
+        <item>(Space)</item>
+        <item>%%</item>
+    </string-array>
     <string-array name="screen_top_bottom_desc" translatable="false">
         <item>Disable</item>
         <item>5</item>
@@ -364,6 +368,7 @@
     <string name="login_succeed">Chatroom logined</string>
     <string name="reChatJoining">relogining\.\.\.</string>
     <string name="settings_data_language">Language</string>
+    <string name="settings_key_words_split">change the way of inputting the keywords </string>
     <string name="settings_data_language_about">change language of YGOPro UI and card database </string>
     <string name="find_in_page">find:</string>
     <string name="tip_card_info_diff">Released and Pre-released Cards are different,pls note after patch them</string>

mobile/src/main/res/xml/preference_game.xml

@@ -114,6 +114,12 @@
             android:key="pref_key_game_lab_pendulum_scale"
             android:persistent="true"
             android:title="@string/settings_game_lab_pendulum_scale" />
+        <ListPreference
+            android:entries="@array/key_words_split"
+            android:entryValues="@array/key_words_split_value"
+            android:key="pref_key_words_split"
+            android:persistent="true"
+            android:title="@string/settings_key_words_split" />
         <!--<CheckBoxPreference
             android:key="pref_settings_deck_manager_v2"
             android:persistent="true"