Commit fe66657b authored by wangfugui's avatar wangfugui

修改class名称

parent a23b3dcb
...@@ -2,9 +2,9 @@ package cn.garymb.ygomobile.bean; ...@@ -2,9 +2,9 @@ package cn.garymb.ygomobile.bean;
public class DeckType extends TextSelect { public class DeckType extends TextSelect {
public enum ServerType { public enum ServerType {
LOCAL, LOCAL,//本地卡组
SQUARE, SQUARE_DECK,//卡组广场上的卡组
MY_SQUARE, MY_SQUARE,//本用户在云上的卡组
} }
private String name; private String name;
......
...@@ -37,6 +37,9 @@ public class DeckFile extends TextSelect { ...@@ -37,6 +37,9 @@ public class DeckFile extends TextSelect {
} }
public DeckFile(File file) { public DeckFile(File file) {
this.onServer = DeckType.ServerType.LOCAL;
this.deckId = null;
path = file; path = file;
fileFullName = file.getName(); fileFullName = file.getName();
String name = fileFullName; String name = fileFullName;
......
...@@ -79,7 +79,7 @@ public class DeckUtil { ...@@ -79,7 +79,7 @@ public class DeckUtil {
deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_pack), AppsSettings.get().getPackDeckDir(), DeckType.ServerType.LOCAL)); deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_pack), AppsSettings.get().getPackDeckDir(), DeckType.ServerType.LOCAL));
deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_windbot_deck), AppsSettings.get().getAiDeckDir(), DeckType.ServerType.LOCAL)); deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_windbot_deck), AppsSettings.get().getAiDeckDir(), DeckType.ServerType.LOCAL));
deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_Uncategorized), AppsSettings.get().getDeckDir(), DeckType.ServerType.LOCAL)); deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_Uncategorized), AppsSettings.get().getDeckDir(), DeckType.ServerType.LOCAL));
deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_online_deck), "", DeckType.ServerType.SQUARE)); deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_online_deck), "", DeckType.ServerType.SQUARE_DECK));
deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_my_online_deck), "", DeckType.ServerType.MY_SQUARE)); deckTypeList.add(new DeckType(YGOUtil.s(R.string.category_my_online_deck), "", DeckType.ServerType.MY_SQUARE));
File[] files = new File(AppsSettings.get().getDeckDir()).listFiles(); File[] files = new File(AppsSettings.get().getDeckDir()).listFiles();
......
...@@ -240,7 +240,7 @@ public class YGODeckDialogUtil { ...@@ -240,7 +240,7 @@ public class YGODeckDialogUtil {
public void onItemSelect(int position, DeckType item) { public void onItemSelect(int position, DeckType item) {
clearDeckSelect(); clearDeckSelect();
deckList.clear(); deckList.clear();
if (item.getOnServer() == DeckType.ServerType.SQUARE) { if (item.getOnServer() == DeckType.ServerType.SQUARE_DECK) {
VUiKit.defer().when(() -> { VUiKit.defer().when(() -> {
SquareDeckResponse result = DeckSquareApiUtil.getSquareDecks(); SquareDeckResponse result = DeckSquareApiUtil.getSquareDecks();
...@@ -255,7 +255,7 @@ public class YGODeckDialogUtil { ...@@ -255,7 +255,7 @@ public class YGODeckDialogUtil {
if (exCardDataList != null) { if (exCardDataList != null) {
LogUtil.i(TAG, "Get square deck success"); LogUtil.i(TAG, "Get square deck success");
for (OnlineDeckDetail deckRecord : exCardDataList) { for (OnlineDeckDetail deckRecord : exCardDataList) {
DeckFile deckFile = new DeckFile(deckRecord.getDeckName(), "", DeckType.ServerType.SQUARE, deckRecord.getDeckId()); DeckFile deckFile = new DeckFile(deckRecord.getDeckName(), "", DeckType.ServerType.SQUARE_DECK, deckRecord.getDeckId());
deckList.add(deckFile); deckList.add(deckFile);
} }
...@@ -322,10 +322,13 @@ public class YGODeckDialogUtil { ...@@ -322,10 +322,13 @@ public class YGODeckDialogUtil {
} }
} }
}); });
//对话框中长点击某一卡组名称后,触发该事件
deckAdp.setOnItemLongClickListener(new OnItemLongClickListener() { deckAdp.setOnItemLongClickListener(new OnItemLongClickListener() {
@Override @Override
public boolean onItemLongClick(@NonNull BaseQuickAdapter adapter, @NonNull View view, int position) { public boolean onItemLongClick(@NonNull BaseQuickAdapter adapter, @NonNull View view, int position) {
if (deckAdp.isSelect() || typeAdp.getSelectPosition() == 0) DeckFile item = (DeckFile) adapter.getItem(position);
//即使为local,也有可能为卡包预览,因此过滤掉selectposition==0
if (deckAdp.isSelect() || !item.isLocal() || typeAdp.getSelectPosition() == 0)
return true; return true;
deckAdp.setManySelect(true); deckAdp.setManySelect(true);
......
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