更改加载收藏夹位置

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

@@ -35,6 +35,7 @@ import com.feihua.dialogutils.util.DialogUtils;
 import com.nightonke.boommenu.BoomButtons.BoomButton;
 import com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton;
 import com.nightonke.boommenu.BoomMenuButton;
+import com.ourygo.assistant.service.DuelAssistantService;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -69,7 +70,6 @@ import cn.garymb.ygomobile.ui.mycard.mcchat.util.ImageUtil;
 import cn.garymb.ygomobile.ui.plus.AOnGestureListener;
 import cn.garymb.ygomobile.ui.plus.DefaultOnBoomListener;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
-import com.ourygo.assistant.service.DuelAssistantService;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.utils.BitmapUtil;
 import cn.garymb.ygomobile.utils.FileUtils;
@@ -77,6 +77,7 @@ import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.ShareUtil;
 import cn.garymb.ygomobile.utils.YGODialogUtil;
 import cn.garymb.ygomobile.utils.YGOUtil;
+import ocgcore.ConfigManager;
 import ocgcore.DataManager;
 import ocgcore.data.Card;
 import ocgcore.data.LimitList;
@@ -101,6 +102,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
     private DialogPlus mDialog;
     private DialogPlus builderShareLoading;
     private boolean isExit = false;
+    List<Card> Favorite = new ArrayList<Card>();
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -275,6 +277,16 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
             initDecksListSpinners(mDeckSpinner, rs.source);
             //设置当前卡组
             setCurDeck(rs);
+            //设置收藏夹
+            ConfigManager systemConf = DataManager.openConfig(mSettings.getSystemConfig());
+            systemConf.read();
+            Card id = new Card();
+            if (systemConf.mLines != null)
+                for(int i = 0; i < systemConf.mLines.size(); i++)
+                    id = mCardLoader.readCards(systemConf.mLines.valueAt(i));
+                    Favorite.add(id);
+
+                onSearchResult(Favorite);
         });
     }
 

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

@@ -75,6 +75,7 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
         mListener = listener;
         handler = new Handler(context.getMainLooper());
         mSettings = AppsSettings.get();
+        checkWindbot();
     }
 
     public static String getDatapath(String path) {
@@ -216,7 +217,6 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
             //systemConf.setFontSize(mSettings.getFontSize());//已弃用
             systemConf.close();
 
-
             //如果是新版本
             if (needsUpdate) {
                 //复制卡组

mobile/src/main/java/ocgcore/ConfigManager.java

 package ocgcore;
 
-import android.util.Log;
-import android.util.SparseArray;
-
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.Closeable;
@@ -13,21 +10,12 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
-import cn.garymb.ygomobile.bean.DeckInfo;
-import cn.garymb.ygomobile.bean.events.CardInfoEvent;
-import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.loader.CardLoader;
-import cn.garymb.ygomobile.ui.plus.DialogPlus;
-import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.utils.IOUtils;
-import ocgcore.data.Card;
-import ocgcore.data.LimitList;
 
 public class ConfigManager implements Closeable {
 
-    public List<String> mLines = new ArrayList<>();
+    public List<Integer> mLines = new ArrayList<>();
     private File file;
 
     ConfigManager(File file) {
@@ -49,10 +37,11 @@ public class ConfigManager implements Closeable {
             BufferedReader reader = new BufferedReader(in);
             String line = null;
             while ((line = reader.readLine()) != null) {
-                mLines.add(line);
+                if (line.startsWith("#"))
+                    continue;
+                mLines.add(Integer.parseInt(line));
             }
         } catch (Exception e) {
-
         } finally {
             IOUtils.close(in);
             IOUtils.close(inputStream);
@@ -97,10 +86,6 @@ public class ConfigManager implements Closeable {
             tmp.renameTo(file);
         }
     }
-
-    public void convertToCardInfos(CardLoader cardLoader, LimitList limitList) {
-        SparseArray<Card> tmp = cardLoader.readCards(mLines, limitList);
-    }
     /*//已弃用通过system.conf设置字体大小
     public void setFontSize(int size) {
         if (!isLoad()) {