Commit f5e11e53 authored by fallenstardust's avatar fallenstardust

rename 方法

添加根据卡包名获取卡包列表的方法
parent d5797b9f
...@@ -88,7 +88,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -88,7 +88,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
private int curPosition; private int curPosition;
private Card mCardInfo; private Card mCardInfo;
private CardListProvider mProvider; private CardListProvider mProvider;
private OnCardClickListener mListener; private OnDeckManagerCardClickListener mListener;
private DialogUtils dialog; private DialogUtils dialog;
private PhotoView photoView; private PhotoView photoView;
private LinearLayout ll_bar; private LinearLayout ll_bar;
...@@ -241,7 +241,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -241,7 +241,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
return mContext; return mContext;
} }
public void setOnCardClickListener(OnCardClickListener listener) { public void setOnCardClickListener(OnDeckManagerCardClickListener listener) {
mListener = listener; mListener = listener;
} }
...@@ -275,7 +275,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -275,7 +275,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
imageLoader.bindImage(cardImage, cardInfo, ImageLoader.Type.middle); imageLoader.bindImage(cardImage, cardInfo, ImageLoader.Type.middle);
dialog = DialogUtils.getdx(context); dialog = DialogUtils.getdx(context);
cardImage.setOnClickListener((v) -> {showCardImageDetail(cardInfo.Code);}); cardImage.setOnClickListener((v) -> {showCardImageDetail(cardInfo.Code);});
packName.setText(packManager.findFileNameById(cardInfo.Alias != 0 ? cardInfo.Alias : cardInfo.Code)); packName.setText(packManager.findPackNameById(cardInfo.Alias != 0 ? cardInfo.Alias : cardInfo.Code));
name.setText(cardInfo.Name); name.setText(cardInfo.Name);
desc.setText(cardInfo.Name.equals("Unknown") ? context.getString(R.string.tip_card_info_diff) : 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())); cardCode.setText(String.format("%08d", cardInfo.getCode()));
...@@ -554,7 +554,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -554,7 +554,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
void onShowPackList(Card card); void onShowPackList(Card card);
} }
public interface OnCardClickListener { public interface OnDeckManagerCardClickListener {
void onOpenUrl(Card cardInfo); void onOpenUrl(Card cardInfo);
void onAddMainCard(Card cardInfo); void onAddMainCard(Card cardInfo);
void onAddSideCard(Card cardInfo); void onAddSideCard(Card cardInfo);
...@@ -562,8 +562,8 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -562,8 +562,8 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
void onClose(); void onClose();
} }
public static class DefaultOnCardClickListener implements OnCardClickListener { public static class OnCardSearcherCardClickListener implements OnDeckManagerCardClickListener {
public DefaultOnCardClickListener() { public OnCardSearcherCardClickListener() {
} }
@Override @Override
......
...@@ -59,7 +59,7 @@ public class CardDetailRandom { ...@@ -59,7 +59,7 @@ public class CardDetailRandom {
mStringManager = DataManager.get().getStringManager(); mStringManager = DataManager.get().getStringManager();
mPackManager = DataManager.get().getPackManager(); mPackManager = DataManager.get().getPackManager();
pack_name.setText(mPackManager.findFileNameById(cardInfo.Alias != 0 ? cardInfo.Alias :cardInfo.Code)); pack_name.setText(mPackManager.findPackNameById(cardInfo.Alias != 0 ? cardInfo.Alias :cardInfo.Code));
name.setText(cardInfo.Name); name.setText(cardInfo.Name);
type.setText(CardUtils.getAllTypeString(cardInfo, mStringManager).replace("/", "|")); type.setText(CardUtils.getAllTypeString(cardInfo, mStringManager).replace("/", "|"));
attrView.setText(mStringManager.getAttributeString(cardInfo.Attribute)); attrView.setText(mStringManager.getAttributeString(cardInfo.Attribute));
......
...@@ -288,7 +288,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB ...@@ -288,7 +288,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
mCardSelector.showFavorites(false); mCardSelector.showFavorites(false);
} }
}); });
mCardDetail.setOnCardClickListener(new CardDetail.DefaultOnCardClickListener() { mCardDetail.setOnCardClickListener(new CardDetail.OnCardSearcherCardClickListener() {
@Override @Override
public void onOpenUrl(Card cardInfo) { public void onOpenUrl(Card cardInfo) {
WebActivity.openFAQ(getContext(), cardInfo); WebActivity.openFAQ(getContext(), cardInfo);
......
...@@ -545,7 +545,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte ...@@ -545,7 +545,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
if (isShowCard()) return; if (isShowCard()) return;
if (mCardDetail == null) { if (mCardDetail == null) {
mCardDetail = new CardDetail((BaseActivity) getActivity(), activity.getImageLoader(), activity.getStringManager()); mCardDetail = new CardDetail((BaseActivity) getActivity(), activity.getImageLoader(), activity.getStringManager());
mCardDetail.setOnCardClickListener(new CardDetail.OnCardClickListener() { mCardDetail.setOnCardClickListener(new CardDetail.OnDeckManagerCardClickListener() {
@Override @Override
public void onOpenUrl(Card cardInfo) { public void onOpenUrl(Card cardInfo) {
WebActivity.openFAQ(getContext(), cardInfo); WebActivity.openFAQ(getContext(), cardInfo);
......
...@@ -107,7 +107,7 @@ public class PackManager implements Closeable { ...@@ -107,7 +107,7 @@ public class PackManager implements Closeable {
* @param id 要查找的ID。 * @param id 要查找的ID。
* @return 如果找到匹配项,则返回对应的文件名;否则返回null。 * @return 如果找到匹配项,则返回对应的文件名;否则返回null。
*/ */
public String findFileNameById(Integer id) { public String findPackNameById(Integer id) {
for (Map.Entry<String, List<Integer>> entry : packList) { for (Map.Entry<String, List<Integer>> entry : packList) {
if (entry.getValue().contains(id)) { if (entry.getValue().contains(id)) {
return entry.getKey().substring(0, entry.getKey().lastIndexOf(Constants.YDK_FILE_EX)); return entry.getKey().substring(0, entry.getKey().lastIndexOf(Constants.YDK_FILE_EX));
...@@ -116,6 +116,23 @@ public class PackManager implements Closeable { ...@@ -116,6 +116,23 @@ public class PackManager implements Closeable {
return null; // 如果没有找到匹配项,则返回null return null; // 如果没有找到匹配项,则返回null
} }
/**
* 通过给定的ID在packList中查找对应的String名称。
*
* @param packName 要查找的ID。
* @return 如果找到匹配项,则返回对应的文件名;否则返回null。
*/
public List<Integer> findIdsByPackName(String packName) {
List<Integer> mList = new ArrayList<>();
for (Map.Entry<String, List<Integer>> entry : packList) {
if (entry.getKey().contains(packName)) {
mList.addAll(entry.getValue());
return mList;
}
}
return null; // 如果没有找到匹配项,则返回null
}
/** /**
* 将packList的内容转换为字符串表示。 * 将packList的内容转换为字符串表示。
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment