优化

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

@@ -130,7 +130,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         }
     };
     private boolean mShowAdd = false;
-    private OnFavoriteChangedListener mCallBack;
+    private OnFavoriteChangedListener mOnFavoriteChangedListener;
 
     public CardDetail(BaseActivity context, ImageLoader imageLoader, StringManager stringManager) {
         super(context.getLayoutInflater().inflate(R.layout.dialog_cardinfo, null));
@@ -214,8 +214,8 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
     public void doMyFavorites(Card cardInfo) {
         boolean ret = CardFavorites.get().toggle(cardInfo.Code);
         mImageFav.setSelected(ret);
-        if (mCallBack != null) {
-            mCallBack.onFavoriteChange(cardInfo, ret);
+        if (mOnFavoriteChangedListener != null) {
+            mOnFavoriteChangedListener.onFavoriteChange(cardInfo, ret);
         }
     }
 
@@ -246,7 +246,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
     }
 
     public void setCallBack(OnFavoriteChangedListener callBack) {
-        mCallBack = callBack;
+        mOnFavoriteChangedListener = callBack;
     }
 
     public void bind(Card cardInfo, final int position, final CardListProvider provider) {
@@ -274,17 +274,10 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         mCardInfo = cardInfo;
         imageLoader.bindImage(cardImage, cardInfo, ImageLoader.Type.middle);
         dialog = DialogUtils.getdx(context);
-        cardImage.setOnClickListener((v) -> {
-            showCardImageDetail(cardInfo.Code);
-        });
-
-        packName.setText(packManager.findFileNameById(cardInfo.Alias != 0 ? cardInfo.Alias :cardInfo.Code));
+        cardImage.setOnClickListener((v) -> {showCardImageDetail(cardInfo.Code);});
+        packName.setText(packManager.findFileNameById(cardInfo.Alias != 0 ? cardInfo.Alias : cardInfo.Code));
         name.setText(cardInfo.Name);
-        if (cardInfo.Name.equals("Unknown")) {
-            desc.setText(R.string.tip_card_info_diff);
-        } else {
-            desc.setText(cardInfo.Desc);
-        }
+        desc.setText(cardInfo.Name.equals("Unknown") ? context.getString(R.string.tip_card_info_diff) : cardInfo.Desc);
         cardCode.setText(String.format("%08d", cardInfo.getCode()));
         if (cardInfo.isType(CardType.Token)) {
             faq.setVisibility(View.INVISIBLE);
@@ -557,18 +550,15 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
     public interface OnFavoriteChangedListener {
         void onFavoriteChange(Card card, boolean favorite);
     }
+    public interface OnShowPackListListener {
+        void onShowPackList(Card card);
+    }
 
     public interface OnCardClickListener {
         void onOpenUrl(Card cardInfo);
-
         void onAddMainCard(Card cardInfo);
-
         void onAddSideCard(Card cardInfo);
-
-
         void onImageUpdate(Card cardInfo);
-
-
         void onClose();
     }
 

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

@@ -23,6 +23,7 @@ import java.util.List;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.loader.CardLoader;
 import cn.garymb.ygomobile.loader.CardSearchInfo;
 import cn.garymb.ygomobile.loader.ICardSearcher;
 import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerAdapter;
@@ -31,6 +32,7 @@ import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import ocgcore.DataManager;
 import ocgcore.LimitManager;
+import ocgcore.PackManager;
 import ocgcore.StringManager;
 import ocgcore.data.Card;
 import ocgcore.data.CardSet;

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

@@ -65,6 +65,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
@@ -77,6 +78,7 @@ import cn.garymb.ygomobile.bean.events.DeckFile;
 import cn.garymb.ygomobile.core.IrrlichtBridge;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.CardLoader;
+import cn.garymb.ygomobile.loader.ICardSearcher;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.activities.WebActivity;
 import cn.garymb.ygomobile.ui.adapters.CardListAdapter;
@@ -102,6 +104,7 @@ import cn.garymb.ygomobile.utils.YGODialogUtil;
 import cn.garymb.ygomobile.utils.YGOUtil;
 import cn.garymb.ygomobile.utils.glide.GlideCompat;
 import ocgcore.DataManager;
+import ocgcore.PackManager;
 import ocgcore.data.Card;
 import ocgcore.data.LimitList;
 import ocgcore.enums.LimitType;
@@ -111,7 +114,8 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     protected DrawerLayout mDrawerLayout;
     protected RecyclerView mListView;
     protected CardLoader mCardLoader;
-    protected CardSearcher mCardSelector;
+    protected CardSearcher mCardSearcher;
+    protected PackManager mPackManager;
     protected CardListAdapter mCardListAdapter;
     protected boolean isLoad = false;
     private HomeActivity activity;
@@ -163,10 +167,11 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         mListView.setAdapter(mCardListAdapter);
         setListeners();
 
+        mPackManager = new PackManager();
         mCardLoader = new CardLoader(getContext());
         mCardLoader.setCallBack(this);
-        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
-        mCardSelector.setCallBack(this);
+        mCardSearcher = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
+        mCardSearcher.setCallBack(this);
 
         tv_deck = layoutView.findViewById(R.id.tv_deck);
         tv_result_count = layoutView.findViewById(R.id.result_count);
@@ -413,7 +418,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         }).done((rs) -> {
             isLoad = true;
             dlg.dismiss();
-            mCardSelector.initItems();
+            mCardSearcher.initItems();
             initLimitListSpinners(mLimitSpinner, mCardLoader.getLimitList());
             //设置当前卡组
             if (rs.source != null) {
@@ -422,7 +427,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                 setCurDeck(rs, false);
             }
             //设置收藏夹
-            mCardSelector.showFavorites(false);
+            mCardSearcher.showFavorites(false);
         });
     }
 
@@ -568,8 +573,8 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                     }
                 });
                 mCardDetail.setCallBack((card, favorite) -> {
-                    if (mCardSelector.isShowFavorite()) {
-                        mCardSelector.showFavorites(false);
+                    if (mCardSearcher.isShowFavorite()) {
+                        mCardSearcher.showFavorites(false);
                     }
                 });
             }

mobile/src/main/java/ocgcore/PackManager.java

@@ -20,8 +20,13 @@ import cn.garymb.ygomobile.ui.plus.VUiKit;
 
 public class PackManager implements Closeable {
     private static final String TAG = PackManager.class.getSimpleName();
+    private static final PackManager sPackManager = new PackManager();
     private final List<Map.Entry<String, List<Integer>>> packList = new ArrayList<>();
 
+    public static PackManager get() {
+        return sPackManager;
+    }
+
     public PackManager() {
     }
 
@@ -44,8 +49,7 @@ public class PackManager implements Closeable {
             Log.e(TAG, "Invalid path provided.");
             return false;
         }
-        File file = new File(path);
-        File[] fileList = file.listFiles();
+        File[] fileList = new File(path).listFiles();
 
         if (fileList == null || fileList.length == 0) {
             Log.w(TAG, "No files found in the directory: " + path);

mobile/src/main/res/layout/dialog_cardinfo.xml

@@ -194,8 +194,6 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:gravity="center_vertical"
-                        android:maxLines="2"
-                        android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                         android:textColor="@color/holo_blue_bright"
                         tools:text="2024-12-21 25PP" />

mobile/src/main/res/layout/dialog_cardinfo_small.xml

@@ -101,8 +101,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center_vertical"
-            android:maxLines="2"
-            android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Caption"
             android:textColor="@color/holo_blue_bright"
             tools:text="2024-12-21 25PP" />