Skip to content

Y
YGOMobile
Commit 53c30ec3 authored by fallenstardust's avatar fallenstardust
Browse files
Options

移除不使用的卡组编辑

parent 712747e2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1553 additions and 3956 deletions
mobile/src/main/java/cn/garymb/ygomobile/loader/ICardSearcher.java 0 → 100644
View file @ 53c30ec3
package cn.garymb.ygomobile.loader;
import ocgcore.data.LimitList;
public interface ICardSearcher extends ICardLoader{
void search(String prefixWord, String suffixWord,
long attribute, long level, long race,String limitName,long limit,
String atk, String def,long pscale,
long setcode, long category, long ot,int link, long... types);
void onReset();
void setLimitList(LimitList limit);
LimitList getLimitList();
}
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/DebugActivity.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.activities;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.RecyclerView;
import cn.garymb.ygomobile.lite.R;
public class DebugActivity extends BaseActivity {
private RecyclerView rv_list;
private Toolbar toolbar;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.debug_activity);
initView();
}
private void initView() {
rv_list=$(R.id.rv_list);
toolbar=$(R.id.toolbar);
setSupportActionBar(toolbar);
enableBackHome();
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/activities/LogoActivity.java
View file @ 53c30ec3
......@@ -27,6 +27,9 @@ public class LogoActivity extends Activity {
finish();
return;
} else {
// File file = new File(AppsSettings.get().getDeckDir(), "1.ydk");
// Uri uri = FileUtils.toUri(this, file);
// Log.w("kk-test", file.getAbsolutePath() + "->" + uri);
handler = new Handler();
runnable = new Runnable() {
@Override
......@@ -40,7 +43,6 @@ public class LogoActivity extends Activity {
}
if (!isTaskRoot()) {
finish();
return;
}
}
......
mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
View file @ 53c30ec3
package cn.garymb.ygomobile.ui.adapters;
import android.content.Context;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
......@@ -32,7 +31,6 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
private boolean mItemBg;
private ImageLoader imageLoader;
private boolean mEnableSwipe = false;
private BaseActivity mContext;
public CardListAdapter(Context context, ImageLoader imageLoader) {
super(context);
......@@ -103,10 +101,10 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
@Override
public void onBindViewHolder(ViewHolder holder, int position) {
Log.e("Cardlist","num"+position);
Card item = getItem(position);
if (item==null)
if(item == null){
return;
}
imageLoader.bindImage(holder.cardImage, item.Code);
holder.cardName.setText(item.Name);
if (item.isType(CardType.Monster)) {
......@@ -126,7 +124,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
}
if (item.isType(CardType.Pendulum)) {
holder.layout_p_scale.setVisibility(View.VISIBLE);
holder.cardScale.setText(String.valueOf(item.LScale));
holder.cardScale.setText(String.valueOf(item.LeftScale));
} else {
holder.layout_p_scale.setVisibility(View.GONE);
}
......
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchAcitivity.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards;
public class CardSearchAcitivity extends CardSearchActivityImpl {
public static final String SEARCH_MESSAGE = "searchMessage";
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity2.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards;
public class DeckManagerActivity2 extends DeckManagerActivityImpl2 {
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity3.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Toast;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.OnItemDragListener;
import androidx.recyclerview.widget.RecyclerView;
import java.io.File;
import java.util.List;
import java.util.Locale;
import cn.garymb.ygomobile.AppsSettings;
import cn.garymb.ygomobile.Constants;
import cn.garymb.ygomobile.bean.DeckInfo;
import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.loader.CardLoader;
import cn.garymb.ygomobile.loader.DeckLoader;
import cn.garymb.ygomobile.ui.activities.BaseActivity;
import cn.garymb.ygomobile.ui.cards.deck2.DeckAdapter;
import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.VUiKit;
import ocgcore.DataManager;
import ocgcore.LimitManager;
import ocgcore.StringManager;
import ocgcore.data.Card;
import ocgcore.data.LimitList;
public class DeckManagerActivity3 extends BaseActivity implements OnItemDragListener, CardLoader.CallBack {
private RecyclerView mRecyclerView;
private DeckAdapter mDeckAdapter;
protected StringManager mStringManager = DataManager.get().getStringManager();
protected LimitManager mLimitManager = DataManager.get().getLimitManager();
protected CardLoader mCardLoader;
private AppsSettings mSettings = AppsSettings.get();
private String mPreLoad;
private File mYdkFile;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_deck_cards3);
Toolbar toolbar = $(R.id.toolbar);
setSupportActionBar(toolbar);
enableBackHome();
mRecyclerView = (RecyclerView) findViewById(R.id.recyclerview);
mDeckAdapter = new DeckAdapter(this, mRecyclerView, this);
mRecyclerView.setAdapter(mDeckAdapter);
findViewById(R.id.refresh).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mDeckAdapter.notifyDataSetChanged();
}
});
mCardLoader = new CardLoader(this);
mCardLoader.setCallBack(this);
if (getIntent().hasExtra(Intent.EXTRA_TEXT)) {
String path = getIntent().getStringExtra(Intent.EXTRA_TEXT);
if (!TextUtils.isEmpty(path)) {
mPreLoad = path;
}
}
DialogPlus dlg = DialogPlus.show(this, null, getString(R.string.loading));
VUiKit.defer().when(() -> {
mCardLoader.setLimitList(mLimitManager.getTopLimit());
File file = new File( mSettings.getLastDeckPath());
if (!TextUtils.isEmpty(mPreLoad)) {
file = new File(mPreLoad);
mPreLoad = null;
}
if (!file.exists()) {
//当默认卡组不存在的时候
File[] files = getYdkFiles();
if (files != null && files.length > 0) {
file = files[0];
}
}
//EXTRA_DECK
if (file == null) {
return new DeckInfo();
}
mYdkFile = file;
if (mCardLoader.isOpen() && file.exists()) {
return DeckLoader.readDeck(mCardLoader, file, mCardLoader.getLimitList());
} else {
return new DeckInfo();
}
}).done((rs) -> {
dlg.dismiss();
mDeckAdapter.setDeckInfo(rs);
mDeckAdapter.notifyDataSetChanged();
});
}
private File[] getYdkFiles() {
File dir = new File(mSettings.getResourcePath(), Constants.CORE_DECK_PATH);
File[] files = dir.listFiles((file, s) -> {
return s.toLowerCase(Locale.US).endsWith(Constants.YDK_FILE_EX);
});
return files;
}
@Override
public void onDragStart() {
}
@Override
public void onDragLongPress(int pos) {
Toast.makeText(this, "on long press :" + pos, Toast.LENGTH_SHORT).show();
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
if (getRequestedOrientation() != newConfig.orientation) {
mDeckAdapter.notifyDataSetChanged();
}
super.onConfigurationChanged(newConfig);
}
@Override
public void onDragLongPressEnd() {
}
@Override
public void onDragEnd() {
}
@Override
public void onSearchStart() {
}
@Override
public void onLimitListChanged(LimitList limitList) {
}
@Override
public void onSearchResult(List<Card> Cards, boolean isHide) {
}
@Override
public void onResetSearch() {
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater.java
View file @ 53c30ec3
......@@ -162,7 +162,7 @@ public class DeckAdapater extends RecyclerView.Adapter<DeckViewHolder> implement
if (d1.getType() == d2.getType()) {
Card c1 = d1.getCardInfo();
Card c2 = d2.getCardInfo();
return CardSort.ASC.compare(c1, c2) < 0;
return CardSort.FULL_ASC.compare(c1, c2) > 0;
}
return (d1.getType().ordinal() - d2.getType().ordinal()) > 0;
}
......
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater2.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards.deck;
import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
import cn.garymb.ygomobile.Constants;
import cn.garymb.ygomobile.bean.DeckInfo;
import cn.garymb.ygomobile.lite.R;
import cn.garymb.ygomobile.loader.ImageLoader;
import ocgcore.data.Card;
import ocgcore.data.LimitList;
import ocgcore.enums.LimitType;
public class DeckAdapater2 extends RecyclerView.Adapter<DeckViewHolder> {
private final ImageLoader mImageLoader;
private final DeckInfo mDeck;
private LimitList mLimitList;
private ImageTop mImageTop;
private final LabelInfo mLabelInfo;
private Context mContext;
private LayoutInflater mLayoutInflater;
public final static int MainLabel = 0;
public final static int MainStart = MainLabel + 1;
public final static int MainEnd = MainStart + Constants.DECK_MAIN_MAX - 1;
public final static int ExtraLabel = MainEnd + 1;
public final static int ExtraStart = ExtraLabel + 1;
public final static int ExtraEnd = ExtraStart + Constants.DECK_EXTRA_MAX - 1;
public final static int SideLabel = ExtraEnd + 1;
public final static int SideStart = SideLabel + 1;
public final static int SideEnd = SideStart + Constants.DECK_SIDE_MAX - 1;
private int cardWidth, cardHeight;
public DeckAdapater2(Context context, int width, int height) {
mContext = context;
cardWidth = width;
cardHeight = height;
mLayoutInflater = LayoutInflater.from(context);
mImageLoader = ImageLoader.get(context);
mDeck = new DeckInfo();
mLabelInfo = new LabelInfo(context);
}
public Context getContext() {
return mContext;
}
public void updateDeck(DeckInfo deck) {
mDeck.update(deck);
mLabelInfo.update(deck);
}
public void setLimitList(LimitList limitList) {
mLimitList = limitList;
}
public ImageTop getImageTop() {
if (mImageTop == null) {
mImageTop = new ImageTop(getContext());
}
return mImageTop;
}
public boolean isLabel(int pos) {
return pos == ExtraLabel || pos == MainLabel || pos == SideLabel;
}
@Override
public DeckViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = mLayoutInflater.inflate(R.layout.item_deck_card2, parent, false);
return new DeckViewHolder(view);
}
@Override
public int getItemCount() {
return Constants.DECK_EXTRA_MAX + Constants.DECK_MAIN_MAX + Constants.DECK_SIDE_MAX + 3;
}
@Override
public void onBindViewHolder(DeckViewHolder holder, int position) {
if (position == ExtraLabel) {
//61 62-76
holder.setText(mLabelInfo.getExtraString());
} else if (position == MainLabel) {
//0 1-60
holder.setText(mLabelInfo.getMainString());
} else if (position == SideLabel) {
//77 78-92
holder.setText(mLabelInfo.getSideString());
} else {
holder.setSize(cardWidth, cardHeight);
Card card = null;
if (inMain(position)) {
card = mDeck.getMainCard(getMainIndex(position));
} else if (inExtra(position)) {
card = mDeck.getExtraCard(getExtraIndex(position));
} else if (inSide(position)) {
card = mDeck.getSideCard(getSideIndex(position));
}
if (card == null) {
holder.showEmpty();
} else {
holder.showImage();
if (mLimitList != null) {
if (mLimitList.check(card, LimitType.Forbidden)) {
holder.setRightImage(getImageTop().forbidden);
} else if (mLimitList.check(card, LimitType.Limit)) {
holder.setRightImage(getImageTop().limit);
} else if (mLimitList.check(card, LimitType.SemiLimit)) {
holder.setRightImage(getImageTop().semiLimit);
} else {
holder.setRightImage(null);
}
} else {
holder.setRightImage(null);
}
mImageLoader.bindImage(holder.cardImage, card.Code);
}
}
}
private int getMainIndex(int pos) {
return pos - MainStart;
}
private int getExtraIndex(int pos) {
return pos - ExtraStart;
}
private int getSideIndex(int pos) {
return pos - SideStart;
}
private boolean inMain(int pos) {
return pos >= MainStart && pos <= MainEnd;
}
private boolean inExtra(int pos) {
return pos >= ExtraStart && pos <= ExtraEnd;
}
private boolean inSide(int pos) {
return pos >= SideStart && pos <= SideEnd;
}
}
class DeckData {
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckLayoutManager2.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards.deck;
import android.content.Context;
import androidx.recyclerview.widget.GridLayoutManager;
public class DeckLayoutManager2 extends GridLayoutManager {
private static final int DEF_LINE_COUNT = 10;
private static final int DEF_LINE_MAX_COUNT = 15;
public DeckLayoutManager2(Context context, int span) {
super(context, span);
setSpanSizeLookup(new SpanSizeLookup() {
@Override
public int getSpanSize(int position) {
if (DeckItemUtils.isLabel(position)) {
return getChildCount();
}
return 1;
}
});
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckHelperCallback.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards.deck2;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.ItemTouchHelperPlus;
import androidx.recyclerview.widget.RecyclerView;
class DeckHelperCallback extends ItemTouchHelperPlus.Callback2 {
private IDeckLayout mDeckAdapter;
DeckHelperCallback(IDeckLayout deckAdapter) {
mDeckAdapter = deckAdapter;
}
private boolean isLabel(int position) {
return mDeckAdapter.isLabel(position);
}
@Override
public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
int id = viewHolder.getAdapterPosition();
if (isLabel(id)) {
return makeMovementFlags(0, 0);
}
int dragFlags;
if (recyclerView.getLayoutManager() instanceof GridLayoutManager) {
dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.RIGHT | ItemTouchHelper.LEFT;
} else {
dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
}
return makeMovementFlags(dragFlags, 0);
}
@Override
public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
return mDeckAdapter.moveItem(viewHolder.getAdapterPosition(), target.getAdapterPosition());
}
@Override
public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckItemDecoration.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards.deck2;
import android.graphics.Rect;
import android.view.View;
import androidx.recyclerview.widget.RecyclerView;
class DeckItemDecoration extends RecyclerView.ItemDecoration {
private IDeckLayout mDeckLayout;
DeckItemDecoration(IDeckLayout deckLayout) {
mDeckLayout = deckLayout;
}
@Override
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
final int LINE_COUNT = mDeckLayout.getLineLimitCount();
final int CARD_COUNT = mDeckLayout.getLineCardCount();
int position = ((RecyclerView.LayoutParams) view.getLayoutParams()).getViewLayoutPosition();
if (mDeckLayout.isLabel(position)) {
super.getItemOffsets(outRect, view, parent, state);
return;
}
float w = mDeckLayout.getWidth10() - mDeckLayout.getWidth15();
int limit;
if (mDeckLayout.isMain(position)) {
position = mDeckLayout.getMainIndex(position);
limit = mDeckLayout.getMainLimit();
} else if (mDeckLayout.isExtra(position)) {
position = mDeckLayout.getExtraIndex(position);
limit = mDeckLayout.getExtraLimit();//10
} else if (mDeckLayout.isSide(position)) {
position = mDeckLayout.getSideIndex(position);
limit = mDeckLayout.getSideLimit();//10
} else {
return;
}
float _w = w / (limit - 1.0f);
float w2;
if (limit < LINE_COUNT - 1) {
//10-13
w = mDeckLayout.getWidth15() * (LINE_COUNT - limit);
w2 = (w / (limit - 1.0f)) - _w;
} else if (limit == LINE_COUNT - 1) {
//14
w = mDeckLayout.getWidth15() * (LINE_COUNT - limit);
_w = _w / 64.0f * 65.0f;
w2 = (w / (limit - 1.0f)) - _w;
} else {
//15
w = mDeckLayout.getWidth15() * (LINE_COUNT - limit);
_w = _w / 32.0f * 33.0f;
w2 = (w / (limit - 1.0f)) - _w;
}
int linePos = position % limit;
outRect.left = (int) (w2 * linePos);
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckLayoutManager.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards.deck2;
import android.content.Context;
import androidx.recyclerview.widget.GridLayoutManagerPlus;
class DeckLayoutManager extends GridLayoutManagerPlus {
DeckLayoutManager(Context context, final int span, final IDeckLayout deckAdapter) {
super(context, span);
setSpanSizeLookup(new SpanSizeLookup() {
@Override
public int getSpanSize(int position) {
if (deckAdapter.isLabel(position)) {
return span;
} else if (deckAdapter.isMain(position)) {
position = deckAdapter.getMainIndex(position);
int limit = deckAdapter.getMainLimit();
if (position % limit == (limit - 1)) {
return span - limit + 1;
}
} else if (deckAdapter.isExtra(position)) {
position = deckAdapter.getExtraIndex(position);
if (deckAdapter.getExtraCount() < deckAdapter.getLineCardCount()) {
if (position == deckAdapter.getExtraCount() - 1) {
return deckAdapter.getLineCardCount() - position;
}
}
} else if (deckAdapter.isSide(position)) {
}
return 1;
}
});
}
}
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/IDeckLayout.java deleted 100644 → 0
View file @ 712747e2
package cn.garymb.ygomobile.ui.cards.deck2;
public interface IDeckLayout {
int getMaxWidth();
int getWidth15();
int getWidth10();
boolean isLabel(int position);
boolean isMain(int position);
boolean isExtra(int position);
boolean isSide(int position);
int getMainCount();
int getExtraCount();
int getSideCount();
int getMainLimit();
int getExtraLimit();
int getSideLimit();
int getMainIndex(int pos);
int getExtraIndex(int pos);
int getSideIndex(int pos);
int getLineLimitCount();
int getLineCardCount();
boolean moveItem(int fromPosition, int toPosition);
}
mobile/src/main/java/cn/garymb/ygomobile/ui/home/ResCheckTask.java
View file @ 53c30ec3
......@@ -379,9 +379,8 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
}
private void fixString(String stringfile) {
String encoding = "utf-8";
List<String> lines = FileUtils.readLines(stringfile, encoding);
FileUtils.writeLines(stringfile, lines, encoding, "\n");
List<String> lines = FileUtils.readLines(stringfile, Constants.DEF_ENCODING);
FileUtils.writeLines(stringfile, lines, Constants.DEF_ENCODING, "\n");
}
public void checkWindbot() {
......
mobile/src/main/java/ocgcore/ConfigManager.java deleted 100644 → 0
View file @ 712747e2
This diff is collapsed.
mobile/src/main/res/color/selector_text_color_white_gold.xml 0 → 100644
View file @ 53c30ec3
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/gold" android:state_selected="true" />
<item android:color="@color/white" />
</selector>
\ No newline at end of file
mobile/src/main/res/layout/activity_deck_cards2.xml deleted 100644 → 0
View file @ 712747e2
This diff is collapsed.
mobile/src/main/res/layout/activity_deck_cards3.xml deleted 100644 → 0
View file @ 712747e2
This diff is collapsed.
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