Commit 01a9e8d8 authored by fallenstardust's avatar fallenstardust

如果有alias则替换显示code

异画卡ourocg改搜索key为alias
parent c99b4029
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
applicationId "cn.garymb.ygomobile" applicationId "cn.garymb.ygomobile"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 354001208 versionCode 354001211
versionName "3.5.4" versionName "3.5.4"
flavorDimensions "versionCode" flavorDimensions "versionCode"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
......
...@@ -19,6 +19,7 @@ import cn.garymb.ygomobile.utils.CardUtils; ...@@ -19,6 +19,7 @@ import cn.garymb.ygomobile.utils.CardUtils;
import ocgcore.DataManager; import ocgcore.DataManager;
import ocgcore.StringManager; import ocgcore.StringManager;
import ocgcore.data.Card; import ocgcore.data.Card;
import ocgcore.data.CardData;
import ocgcore.data.LimitList; import ocgcore.data.LimitList;
import ocgcore.enums.CardType; import ocgcore.enums.CardType;
import ocgcore.enums.LimitType; import ocgcore.enums.LimitType;
...@@ -162,7 +163,11 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i ...@@ -162,7 +163,11 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
//卡片类型 //卡片类型
holder.cardType.setText(CardUtils.getAllTypeString(item, mStringManager)); holder.cardType.setText(CardUtils.getAllTypeString(item, mStringManager));
if (holder.codeView != null) { if (holder.codeView != null) {
holder.codeView.setText(String.format("%08d", item.Code)); if(item.Alias != 0) {
holder.codeView.setText(String.format("%08d", item.Alias));
} else {
holder.codeView.setText(String.format("%08d", item.Code));
}
} }
bindMenu(holder, position); bindMenu(holder, position);
} }
......
...@@ -51,16 +51,16 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack ...@@ -51,16 +51,16 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
private ImageLoader mImageLoader; private ImageLoader mImageLoader;
private String intentSearchMessage; private String intentSearchMessage;
private boolean isFirstCardSearch=true; private boolean isFirstCardSearch = true;
private String currentCardSearchMessage=""; private String currentCardSearchMessage = "";
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search); setContentView(R.layout.activity_search);
if(TextUtils.isEmpty(getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE))){ if (TextUtils.isEmpty(getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE))) {
ServiceDuelAssistant.cardSearchMessage=""; ServiceDuelAssistant.cardSearchMessage = "";
} }
Toolbar toolbar = $(R.id.toolbar); Toolbar toolbar = $(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
...@@ -98,20 +98,20 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack ...@@ -98,20 +98,20 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
mCardLoader.loadData(); mCardLoader.loadData();
mCardSelector.initItems(); mCardSelector.initItems();
intentSearch(); intentSearch();
isFirstCardSearch=false; isFirstCardSearch = false;
}); });
} }
@Override @Override
protected void onRestart() { protected void onRestart() {
super.onRestart(); super.onRestart();
if (!isFirstCardSearch&&!currentCardSearchMessage.equals(ServiceDuelAssistant.cardSearchMessage)){ if (!isFirstCardSearch && !currentCardSearchMessage.equals(ServiceDuelAssistant.cardSearchMessage)) {
currentCardSearchMessage=ServiceDuelAssistant.cardSearchMessage; currentCardSearchMessage = ServiceDuelAssistant.cardSearchMessage;
intentSearch(); intentSearch();
} }
} }
private void intentSearch(){ private void intentSearch() {
// intentSearchMessage=getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE); // intentSearchMessage=getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE);
mCardSelector.search(ServiceDuelAssistant.cardSearchMessage); mCardSelector.search(ServiceDuelAssistant.cardSearchMessage);
} }
...@@ -269,7 +269,12 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack ...@@ -269,7 +269,12 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
mCardDetail.setOnCardClickListener(new CardDetail.DefaultOnCardClickListener() { mCardDetail.setOnCardClickListener(new CardDetail.DefaultOnCardClickListener() {
@Override @Override
public void onOpenUrl(Card cardInfo) { public void onOpenUrl(Card cardInfo) {
String uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Code); String uri;
if (cardInfo.Alias != 0) {
uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Alias);
} else {
uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Code);
}
WebActivity.open(getContext(), cardInfo.Name, uri); WebActivity.open(getContext(), cardInfo.Name, uri);
} }
......
...@@ -403,7 +403,12 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -403,7 +403,12 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
mCardDetail.setOnCardClickListener(new CardDetail.OnCardClickListener() { mCardDetail.setOnCardClickListener(new CardDetail.OnCardClickListener() {
@Override @Override
public void onOpenUrl(Card cardInfo) { public void onOpenUrl(Card cardInfo) {
String uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Code); String uri;
if (cardInfo.Alias != 0) {
uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Alias);
} else {
uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Code);
}
WebActivity.open(getContext(), cardInfo.Name, uri); WebActivity.open(getContext(), cardInfo.Name, uri);
} }
......
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