修改打开卡组码和卡组文件的方式

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

@@ -215,7 +215,7 @@ public class GameUriManager {
             Log.i(Constants.TAG, "open file:" + uri + "->" + file.getAbsolutePath());
             if (isYdk) {
                 startSetting.putExtra("flag", 2);
-                DeckManagerFragment.start(activity, file.getAbsolutePath());
+                startSetting.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
             } else if (isYpk) {
                 if (!AppsSettings.get().isReadExpansions()) {
                     startSetting.putExtra("flag", 4);
@@ -255,7 +255,8 @@ public class GameUriManager {
                     if (!deckInfo.isCompleteDeck()) {
                         YGOUtil.show("当前卡组缺少完整信息，将只显示已有卡片");
                     }
-                    DeckManagerFragment.start(activity, file.getAbsolutePath());
+                    startSetting.putExtra("flag", 2);
+                    startSetting.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
                 }
             } else if (Constants.URI_ROOM.equals(host)) {
                 YGODAUtil.deRoomListener(uri, (host1, port, password, exception) -> {
@@ -293,7 +294,9 @@ public class GameUriManager {
             }
         }
         if (deck != null && deck.exists()) {
-            DeckManagerFragment.start(activity, deck.getAbsolutePath());
+            Intent startSetting = new Intent(activity, MainActivity.class);
+            startSetting.putExtra("flag", 2);
+            startSetting.putExtra(Intent.EXTRA_TEXT, deck.getAbsolutePath());
         } else {
             Log.w("kk", "no find " + name);
             activity.finish();

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

@@ -99,6 +99,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
+        String strDeck = "";
         int mFlag = intent.getIntExtra("flag", 0);
         if (mFlag == 4) { //判断获取到的flag值
             switchFragment(fragment_personal);
@@ -108,6 +109,10 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
             switchFragment(fragment_deck_cards);
         } else if (mFlag == 1) {
             switchFragment(fragment_search);
+        } else if (intent.hasExtra(Intent.EXTRA_TEXT)) {
+            strDeck = intent.getStringExtra(Intent.EXTRA_TEXT);
+            Toast.makeText(getActivity(), strDeck, Toast.LENGTH_LONG).show();
+            fragment_deck_cards.init(new File(strDeck));
         }
     }
 

mobile/src/main/java/com/ourygo/assistant/service/DuelAssistantService.java

@@ -225,6 +225,7 @@ public class DuelAssistantService extends Service implements OnDuelAssistantList
         bt_close.setOnClickListener(v -> disJoinDialog());
         bt_join.setOnClickListener(v -> {
             disJoinDialog();
+            Intent startSetting = new Intent(getBaseContext(), MainActivity.class);
             //如果是卡组url
             if (isUrl) {
                 Deck deckInfo = new Deck(getString(R.string.rename_deck) + System.currentTimeMillis(), Uri.parse(deckMessage));
@@ -232,13 +233,16 @@ public class DuelAssistantService extends Service implements OnDuelAssistantList
                 if (!deckInfo.isCompleteDeck()){
                     YGOUtil.show("当前卡组缺少完整信息，将只显示已有卡片");
                 }
-                DeckManagerFragment.start(DuelAssistantService.this, file.getAbsolutePath());
+
+                startSetting.putExtra("flag", 2);
+                startSetting.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
             } else {
                 //如果是卡组文本
                 try {
                     //以当前时间戳作为卡组名保存卡组
                     File file = DeckUtils.save(getString(R.string.rename_deck) + System.currentTimeMillis(), deckMessage);
-                    DeckManagerFragment.start(DuelAssistantService.this, file.getAbsolutePath());
+                    startSetting.putExtra("flag", 2);
+                    startSetting.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
                 } catch (IOException e) {
                     e.printStackTrace();
                     Toast.makeText(DuelAssistantService.this, getString(R.string.save_failed_bcos) + e, Toast.LENGTH_SHORT).show();