修复无更新时检查更新对话框不关闭的问题

新增剪贴板关键字卡查（c#卡片关键字），软件运行时复制即可卡查

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

 package cn.garymb.ygomobile.ui.cards;
 
 public class CardSearchAcitivity extends CardSearchActivityImpl{
-
+    public static final String SEARCH_MESSAGE="searchMessage";
 }

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

 package cn.garymb.ygomobile.ui.cards;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.DrawerLayout;
@@ -8,6 +9,8 @@ import android.support.v7.widget.FastScrollLinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerViewItemListener;
 import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -28,6 +31,7 @@ import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.adapters.CardListAdapter;
 import cn.garymb.ygomobile.ui.plus.AOnGestureListener;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
+import cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import ocgcore.DataManager;
 import ocgcore.LimitManager;
@@ -36,6 +40,7 @@ import ocgcore.data.Card;
 import ocgcore.data.LimitList;
 
 class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack {
+
     protected DrawerLayout mDrawerlayout;
     private RecyclerView mListView;
     protected CardSearcher mCardSelector;
@@ -46,10 +51,17 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
     protected LimitManager mLimitManager = DataManager.get().getLimitManager();
     private ImageLoader mImageLoader;
 
+    private String intentSearchMessage;
+    private boolean isFirstCardSearch=true;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search);
+
+        if(TextUtils.isEmpty(getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE))){
+            ServiceDuelAssistant.cardSearchMessage="";
+        }
         Toolbar toolbar = $(R.id.toolbar);
         setSupportActionBar(toolbar);
         enableBackHome();
@@ -85,9 +97,25 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
             isLoad = true;
             mCardLoader.loadData();
             mCardSelector.initItems();
+            intentSearch();
+            isFirstCardSearch=false;
         });
     }
 
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        if (!isFirstCardSearch){
+            intentSearch();
+        }
+    }
+
+
+    private void intentSearch(){
+//        intentSearchMessage=getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE);
+        mCardSelector.search(ServiceDuelAssistant.cardSearchMessage);
+    }
+
     protected void setListeners() {
         mListView.addOnItemTouchListener(new RecyclerViewItemListener(mListView, new RecyclerViewItemListener.OnItemListener() {
             @Override

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

@@ -491,6 +491,14 @@ public class CardSearcher implements View.OnClickListener {
         }
     }
 
+    public void search(String message){
+        if (TextUtils.isEmpty(message)){
+            message="";
+        }
+        prefixWord.setText(message);
+        search();
+    }
+
     private void search() {
         if (dataLoader != null) {
             dataLoader.search(text(prefixWord), text(suffixWord), getSelect(attributeSpinner)

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

@@ -422,6 +422,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
                     @Override
                     public void onNoUpdateAvailable() {
                         if (isToastNoUpdata){
+                            builder.dismiss();
                             Toast.makeText(context, R.string.Already_Lastest, Toast.LENGTH_SHORT).show();
                         }
                     }
@@ -430,6 +431,8 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
                         final String versionName,updateMessage;
                         versionName = appBean.getVersionName();
                         updateMessage = appBean.getReleaseNote();
+                        builder.hideProgressBar();
+                        builder.showTitleBar();
                         builder.setTitle(context.getResources().getString(R.string.Update_Found) + versionName);
                         builder.setMessage(updateMessage);
                         builder.setRightButtonText(R.string.Download);

mobile/src/main/java/cn/garymb/ygomobile/ui/plus/ServiceDuelAssistant.java

@@ -10,6 +10,8 @@ import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,6 +30,7 @@ import cn.garymb.ygomobile.bean.ServerInfo;
 import cn.garymb.ygomobile.bean.ServerList;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.adapters.ServerListAdapter;
+import cn.garymb.ygomobile.ui.cards.CardSearchAcitivity;
 import cn.garymb.ygomobile.ui.home.ServerListManager;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.XmlUtils;
@@ -36,6 +39,11 @@ import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
 
 
 public class ServiceDuelAssistant extends Service {
+
+    public static String cardSearchMessage;
+    //卡查关键字
+    private String[] cardSearchKey = new String[]{"c#", "C#"};
+
     private LinearLayout mFloatLayout;
     private TextView ds_text;
     private Button ds_join, ds_qx;
@@ -76,7 +84,7 @@ public class ServiceDuelAssistant extends Service {
         // TODO: Implement this method
         super.onCreate();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            startForeground(1,new Notification());
+            startForeground(1, new Notification());
         }
 
         //lc = new ArrayList<Card>();
@@ -91,27 +99,40 @@ public class ServiceDuelAssistant extends Service {
             public void onPrimaryClipChanged() {
                 ClipData clipData = cm.getPrimaryClip();
                 CharSequence cs = clipData.getItemAt(0).getText();
-                final String ss;
+                final String clipMessage;
                 if (cs != null) {
-                    ss = cs.toString();
+                    clipMessage = cs.toString();
                 } else {
-                    ss = "";
+                    clipMessage = null;
+                }
+
+                //如果复制的内容为空则不执行下面的代码
+                if (TextUtils.isEmpty(clipMessage)) {
+                    return;
                 }
-					/*final int ssi=ss.indexOf("卡查");
-					if (ssi != -1) {
-						cxCard(ss, ssi);
-					} else {*/
                 int start = -1;
 
                 for (String st : passwordPrefix) {
-                    start = ss.indexOf(st);
+                    start = clipMessage.indexOf(st);
                     if (start != -1) {
                         break;
                     }
                 }
 
                 if (start != -1) {
-                    joinRoom(ss, start);
+                    joinRoom(clipMessage, start);
+                } else {
+                    for (String s : cardSearchKey) {
+                        int cardSearchStart=clipMessage.indexOf(s);
+                        if ( cardSearchStart!= -1) {
+                            //卡查内容
+                            cardSearchMessage=clipMessage.substring(cardSearchStart+s.length(),clipMessage.length());
+                            Intent intent = new Intent(ServiceDuelAssistant.this, CardSearchAcitivity.class);
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            intent.putExtra(CardSearchAcitivity.SEARCH_MESSAGE,cardSearchMessage);
+                            startActivity(intent);
+                        }
+                    }
                 }
             }