不对收藏夹按code排序

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

@@ -58,19 +58,24 @@ public class CardLoader implements ICardLoader {
         }
     }
 
-    public SparseArray<Card> readCards(List<Integer> ids) {
-        return readCards(ids, mLimitList);
+    public SparseArray<Card> readCards(List<Integer> ids, boolean isSorted) {
+        return readCards(ids, mLimitList, isSorted);
     }
 
-    public SparseArray<Card> readCards(List<Integer> ids, LimitList limitList) {
+    public SparseArray<Card> readCards(List<Integer> ids, LimitList limitList, boolean isSorted) {
         if (!isOpen()) {
             return null;
         }
         SparseArray<Card> map = new SparseArray<>();
-        for (Integer id : ids) {
-            if (id != 0) {
-                map.put(id, mCardManager.getCard(id));
+        if (isSorted) {
+            for (Integer id : ids) {
+                if (id != 0) {
+                    map.put(id, mCardManager.getCard(id));
+                }
             }
+        } else {
+            for (int i = 0; i < ids.size(); i++)
+                map.put(i, mCardManager.getCard(ids.get(i)));
         }
         return map;
     }

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

@@ -26,7 +26,7 @@ public class DeckLoader {
         try {
             inputStream = new FileInputStream(file);
             deckInfo = readDeck(cardLoader, inputStream, limitList);
-            if(deckInfo != null){
+            if (deckInfo != null) {
                 deckInfo.source = file;
             }
         } catch (Exception e) {
@@ -101,15 +101,15 @@ public class DeckLoader {
             IOUtils.close(in);
         }
         DeckInfo deckInfo = new DeckInfo();
-        SparseArray<Card> tmp = cardLoader.readCards(deck.getMainlist(), limitList);
+        SparseArray<Card> tmp = cardLoader.readCards(deck.getMainlist(), limitList, true);
         for (Integer id : deck.getMainlist()) {
             deckInfo.addMainCards(tmp.get(id));
         }
-        tmp = cardLoader.readCards(deck.getExtraList(), limitList);
+        tmp = cardLoader.readCards(deck.getExtraList(), limitList, true);
         for (Integer id : deck.getExtraList()) {
             deckInfo.addExtraCards(tmp.get(id));
         }
-        tmp = cardLoader.readCards(deck.getSideList(), limitList);
+        tmp = cardLoader.readCards(deck.getSideList(), limitList, true);
 //        Log.i("kk", "desk:" + tmp.size()+"/"+side.size());
         for (Integer id : deck.getSideList()) {
             deckInfo.addSideCards(tmp.get(id));

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

@@ -219,7 +219,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         favConf.save("#Favorite");
         favConf.read();
         Favorite.clear();
-        SparseArray<Card> id = mCardLoader.readCards(ConfigManager.mLines);
+        SparseArray<Card> id = mCardLoader.readCards(ConfigManager.mLines, false);
         if (id != null) {
             for (int i = 0; i < id.size(); i++)
                 Favorite.add(id.valueAt(i));

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

@@ -279,7 +279,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
             //设置当前卡组
             setCurDeck(rs);
             //设置收藏夹
-            SparseArray<Card> id = mCardLoader.readCards(ConfigManager.mLines);
+            SparseArray<Card> id = mCardLoader.readCards(ConfigManager.mLines, false);
             if (id != null) {
                 for (int i = 0; i < id.size(); i++)
                     Favorite.add(id.valueAt(i));