对cardsearcher和deckmananger不公用homeactivity初始化的cardloader

各自分别初始化一个cardloader自用

mobile/assets/changelog.html

@@ -25,6 +25,7 @@
     3.内置卡图分辨率提高到200x290；
     4.微调部分UI；
     5.增加幻想魔族；
+    6.ygopro版本号1036.0
     变更：
     1.修正启动ygopro后竖屏界面卡片详情图片不加载的问题；
     2.加速动画单独增加按钮；

mobile/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 21
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 311000946
+        versionCode 311000947
         versionName "3.11.0"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

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

@@ -53,6 +53,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
     long exitLasttime = 0;
 
     private HomeActivity activity;
+    protected CardLoader mCardLoader;
     protected DrawerLayout mDrawerlayout;
     protected CardSearcher mCardSelector;
     protected CardListAdapter mCardListAdapter;
@@ -90,15 +91,16 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
         mListView.setAdapter(mCardListAdapter);
         Button btn_search = layoutView.findViewById(R.id.btn_search);
         btn_search.setOnClickListener((v) -> showSearch(true));
-        activity.getCardLoader().setCallBack(this);
-        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), activity.getCardLoader());
+        mCardLoader = new CardLoader(getContext());
+        mCardLoader.setCallBack(this);
+        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
         mCardSelector.setCallBack(this);
         setListeners();
         DialogPlus dlg = DialogPlus.show(getContext(), null, getString(R.string.loading));
         VUiKit.defer().when(() -> {
             DataManager.get().load(true);
             if (activity.getmLimitManager().getCount() > 0) {
-                activity.getCardLoader().setLimitList(activity.getmLimitManager().getTopLimit());
+                mCardLoader.setLimitList(activity.getmLimitManager().getTopLimit());
             }
         }).fail((e) -> {
             Toast.makeText(getContext(), R.string.tip_load_cdb_error, Toast.LENGTH_SHORT).show();
@@ -106,7 +108,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
         }).done((rs) -> {
             dlg.dismiss();
             isLoad = true;
-            activity.getCardLoader().loadData();
+            mCardLoader.loadData();
             mCardSelector.initItems();
             //数据库初始化完毕后搜索被传入的关键字
             intentSearch(intentSearchMessage);

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

@@ -111,6 +111,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     private static final String TAG = "DeckManagerFragment";
     protected DrawerLayout mDrawerLayout;
     protected RecyclerView mListView;
+    protected CardLoader mCardLoader;
     protected CardSearcher mCardSelector;
     protected CardListAdapter mCardListAdapter;
     protected boolean isLoad = false;
@@ -163,8 +164,9 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         mListView.setAdapter(mCardListAdapter);
         setListeners();
 
-        activity.getCardLoader().setCallBack(this);
-        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), activity.getCardLoader());
+        mCardLoader = new CardLoader(getContext());
+        mCardLoader.setCallBack(this);
+        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
         mCardSelector.setCallBack(this);
 
         tv_deck = layoutView.findViewById(R.id.tv_deck);
@@ -360,14 +362,14 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
 
     //region load deck
     private void loadDeckFromFile(File file) {
-        if (!activity.getCardLoader().isOpen() || file == null || !file.exists()) {
+        if (!mCardLoader.isOpen() || file == null || !file.exists()) {
             setCurDeck(new DeckInfo(), false);
             return;
         }
         DialogPlus dlg = DialogPlus.show(getContext(), null, getString(R.string.loading));
         VUiKit.defer().when(() -> {
-            if (activity.getCardLoader().isOpen() && file.exists()) {
-                return mDeckAdapater.read(activity.getCardLoader(), file, activity.getCardLoader().getLimitList());
+            if (mCardLoader.isOpen() && file.exists()) {
+                return mDeckAdapater.read(mCardLoader, file, mCardLoader.getLimitList());
             } else {
                 return new DeckInfo();
             }
@@ -384,7 +386,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
             DataManager.get().load(true);
             //默认第一个卡表
             if (activity.getmLimitManager().getCount() > 0) {
-                activity.getCardLoader().setLimitList(activity.getmLimitManager().getTopLimit());
+                mCardLoader.setLimitList(activity.getmLimitManager().getTopLimit());
             }
             File file = ydk;
             if (file == null || !file.exists()) {
@@ -399,8 +401,8 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                 return new DeckInfo();
             }
             Log.i(TAG, "load ydk " + file);
-            if (activity.getCardLoader().isOpen() && file.exists()) {
-                return mDeckAdapater.read(activity.getCardLoader(), file, activity.getCardLoader().getLimitList());
+            if (mCardLoader.isOpen() && file.exists()) {
+                return mDeckAdapater.read(mCardLoader, file, mCardLoader.getLimitList());
             } else {
                 return new DeckInfo();
             }
@@ -408,7 +410,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
             isLoad = true;
             dlg.dismiss();
             mCardSelector.initItems();
-            initLimitListSpinners(mLimitSpinner, activity.getCardLoader().getLimitList());
+            initLimitListSpinners(mLimitSpinner, mCardLoader.getLimitList());
             //设置当前卡组
             if (rs.source != null) {
                 setCurDeck(rs, rs.source.getParent().equals(mSettings.getPackDeckDir()));