修复卡组码、卡组文件、ydk文本跳转打开卡组fragment

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

@@ -5,10 +5,8 @@ import static cn.garymb.ygomobile.Constants.ORI_DECK;
 import static cn.garymb.ygomobile.Constants.YDK_FILE_EX;
 import static cn.garymb.ygomobile.core.IrrlichtBridge.ACTION_SHARE_FILE;
 
-import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -85,7 +83,6 @@ import cn.garymb.ygomobile.ui.cards.deck.DeckItem;
 import cn.garymb.ygomobile.ui.cards.deck.DeckItemTouchHelper;
 import cn.garymb.ygomobile.ui.cards.deck.DeckItemType;
 import cn.garymb.ygomobile.ui.cards.deck.DeckLayoutManager;
-import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.ui.mycard.mcchat.util.ImageUtil;
 import cn.garymb.ygomobile.ui.plus.AOnGestureListener;
 import cn.garymb.ygomobile.ui.plus.DefaultOnBoomListener;
@@ -205,8 +202,10 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     }
 
     public void preLoadFile() {
-        Bundle bundle = getArguments();
-        String preLoadFile = bundle.getString("setDeck");
+        String preLoadFile = "";
+        if (getArguments() != null) {
+            preLoadFile = getArguments().getString("setDeck");
+        }
         final File _file;
         //打开指定卡组
         if (!TextUtils.isEmpty(preLoadFile) && (mPreLoadFile = new File(preLoadFile)).exists()) {

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

 package cn.garymb.ygomobile.ui.home;
 
+import static cn.garymb.ygomobile.ui.home.HomeFragment.ID_HOMEFRAGMENT;
+
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -41,8 +43,6 @@ import cn.garymb.ygomobile.utils.YGOUtil;
 
 public abstract class HomeActivity extends BaseActivity implements OnDuelAssistantListener, BottomNavigationBar.OnTabSelectedListener {
 
-    private static final int ID_MAINACTIVITY = 0;
-
     long exitLasttime = 0;
 
     private BottomNavigationBar bottomNavigationBar;
@@ -54,6 +54,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
     private DeckManagerFragment fragment_deck_cards;
     private MycardFragment fragment_mycard;
     private PersonalFragment fragment_personal;
+    private Bundle mBundle;
 
 
     private DuelAssistantManagement duelAssistantManagement;
@@ -63,7 +64,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
         setExitAnimEnable(false);
-
+        mBundle = new Bundle();
         QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
             @Override
             public void onViewInitFinished(boolean arg0) {
@@ -107,14 +108,12 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
             switchFragment(fragment_mycard, 3);
 
         } else if (intent.hasExtra(Intent.EXTRA_TEXT)) {
-            switchFragment(fragment_deck_cards, 2);
             String strDeck = intent.getStringExtra(Intent.EXTRA_TEXT);
             if (!strDeck.isEmpty()) {
-                Bundle bundle = new Bundle();
-                bundle.putString("setDeck", strDeck);
-                fragment_deck_cards.setArguments(bundle);
+                mBundle.putString("setDeck", strDeck);
+                fragment_deck_cards.setArguments(mBundle);
             }
-
+            switchFragment(fragment_deck_cards, 2);
         } else if (mFlag == 1) {
             switchFragment(fragment_search, 1);
         }
@@ -212,7 +211,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-                duelAssistantManagement.checkClip(ID_MAINACTIVITY);
+                duelAssistantManagement.checkClip(ID_HOMEFRAGMENT);
             }, 500);
         }
     }
@@ -230,16 +229,17 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
 
     @Override
     public void onCardSearch(String key, int id) {
-        if (id == ID_MAINACTIVITY) {
+        /*
+        if (id == ID_HOMEFRAGMENT) {
             Intent intent = new Intent(this, CardSearchFragment.class);
             intent.putExtra(CardSearchFragment.SEARCH_MESSAGE, key);
             startActivity(intent);
-        }
+        }*/
     }
 
     @Override
     public void onSaveDeck(String message, boolean isUrl, int id) {
-        if (id == ID_MAINACTIVITY) {
+        if (fragment_home.isVisible()) {
             saveDeck(message, isUrl);
         }
     }
@@ -326,12 +326,20 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
                 if (!deckInfo.isCompleteDeck()) {
                     YGOUtil.show("当前卡组缺少完整信息，将只显示已有卡片");
                 }
+                if (!file.getAbsolutePath().isEmpty()) {
+                    mBundle.putString("setDeck", file.getAbsolutePath());
+                    fragment_deck_cards.setArguments(mBundle);
+                }
                 switchFragment(fragment_deck_cards, 2);
             } else {
                 //如果是卡组文本
                 try {
                     //以当前时间戳作为卡组名保存卡组
                     File file = DeckUtils.save(getString(R.string.rename_deck) + System.currentTimeMillis(), deckMessage);
+                    if (!file.getAbsolutePath().isEmpty()) {
+                        mBundle.putString("setDeck", file.getAbsolutePath());
+                        fragment_deck_cards.setArguments(mBundle);
+                    }
                     switchFragment(fragment_deck_cards, 2);
                 } catch (IOException e) {
                     e.printStackTrace();

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

@@ -56,6 +56,7 @@ import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.base.BaseFragemnt;
+import cn.garymb.ygomobile.bean.Deck;
 import cn.garymb.ygomobile.bean.ServerInfo;
 import cn.garymb.ygomobile.bean.ServerList;
 import cn.garymb.ygomobile.bean.events.ServerInfoEvent;
@@ -66,6 +67,7 @@ import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.adapters.ServerListAdapter;
 import cn.garymb.ygomobile.ui.adapters.SimpleListAdapter;
 import cn.garymb.ygomobile.ui.cards.CardDetailRandom;
+import cn.garymb.ygomobile.ui.cards.deck.DeckUtils;
 import cn.garymb.ygomobile.ui.mycard.McNews;
 import cn.garymb.ygomobile.ui.mycard.MyCard;
 import cn.garymb.ygomobile.ui.mycard.mcchat.util.ImageUtil;
@@ -75,13 +77,14 @@ import cn.garymb.ygomobile.ui.widget.Shimmer;
 import cn.garymb.ygomobile.ui.widget.ShimmerTextView;
 import cn.garymb.ygomobile.utils.FileUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
+import cn.garymb.ygomobile.utils.YGOUtil;
 import ocgcore.CardManager;
 import ocgcore.DataManager;
 import ocgcore.data.Card;
 
 
 public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
-    private static final int ID_HOMEFRAGMENT = 0;
+    public static final int ID_HOMEFRAGMENT = 0;
 
     private static final int TYPE_BANNER_QUERY_OK = 0;
     private static final int TYPE_BANNER_QUERY_EXCEPTION = 1;