fix启动决斗助手闪退&无法检测ydk文本

update en strings.conf

mobile/assets_en/data/conf/strings.conf

@@ -1002,7 +1002,7 @@
 !setname 0x134 Generaider
 !setname 0x135 @Ignister
 !setname 0x136 A.I.
-!setname 0x137 Senka
+!setname 0x137 Ancient Warriors
 !setname 0x138 Megalith
 !setname 0x139 Palladium Oracle
 !setname 0x13a Onomato

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 360300224
+        versionCode 360300226
         versionName "3.6.3"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

 package cn.garymb.ygomobile.ui.home;
 
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.Menu;
@@ -37,7 +32,6 @@ import com.nightonke.boommenu.BoomButtons.BoomButton;
 import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton;
 import com.nightonke.boommenu.BoomMenuButton;
 import com.ourygo.assistant.base.listener.OnDuelAssistantListener;
-import com.ourygo.assistant.service.DuelAssistantService;
 import com.ourygo.assistant.util.DuelAssistantManagement;
 import com.ourygo.assistant.util.Util;
 import com.tencent.bugly.beta.Beta;
@@ -143,7 +137,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
         TrPay.getInstance(HomeActivity.this).initPaySdk("e1014da420ea4405898c01273d6731b6", "YGOMobile");
         //check update
         Beta.checkUpgrade(false, false);
-       //初始化决斗助手
+        //初始化决斗助手
         initDuelAssistant();
         //萌卡
         StartMycard();
@@ -182,11 +176,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     @Override
     public void onJoinRoom(String password, int id) {
         if (id == ID_MAINACTIVITY) {
-            try {
-                FileLogUtil.writeAndTime("主页加房触发");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
             QuickjoinRoom(password);
         }
     }
@@ -194,11 +183,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     @Override
     public void onCardSearch(String key, int id) {
         if (id == ID_MAINACTIVITY) {
-            try {
-                FileLogUtil.writeAndTime("主页卡查触发");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
             Intent intent = new Intent(this, CardSearchAcitivity.class);
             intent.putExtra(CardSearchAcitivity.SEARCH_MESSAGE, key);
             startActivity(intent);
@@ -208,12 +192,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     @Override
     public void onSaveDeck(String message, boolean isUrl, int id) {
         if (id == ID_MAINACTIVITY) {
-            try {
-                FileLogUtil.writeAndTime("主页保存卡组触发");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            saveDeck(message,isUrl);
+            saveDeck(message, isUrl);
         }
     }
 
@@ -243,7 +222,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     @Override
     protected void onDestroy() {
         super.onDestroy();
-       duelAssistantManagement.removeDuelAssistantListener(this);
+        duelAssistantManagement.removeDuelAssistantListener(this);
         EventBus.getDefault().unregister(this);
     }
 

mobile/src/main/java/com/ourygo/assistant/util/ClipManagement.java

@@ -54,11 +54,6 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
             }
             return null;
         }
-        try {
-            FileLogUtil.writeAndTime("剪贴板内容获取："+clipData.getItemAt(0).getText().toString());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         return clipData.getItemAt(0).getText().toString();
     }
 
@@ -74,11 +69,6 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
         if (TextUtils.isEmpty(clipMessage)) {
             return;
         }
-        try {
-            FileLogUtil.writeAndTime("剪贴板监听触发："+clipMessage);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         if (onClipChangedListener!=null)
             onClipChangedListener.onClipChanged(clipMessage,false,ID_CLIP_LISTENER);
     }

mobile/src/main/java/com/ourygo/assistant/util/DuelAssistantManagement.java

@@ -68,7 +68,7 @@ public class DuelAssistantManagement implements OnClipChangedListener {
     public boolean deckCheck(String message, int id) {
         //如果复制的内容是多行作为卡组去判断
         if (message.contains("\n")) {
-            for (String s : Record.CARD_SEARCH_KEY) {
+            for (String s : Record.DeckTextKey) {
                 //只要包含其中一个关键字就视为卡组
                 if (message.contains(s)) {
                     onSaveDeck(message, false, id);