Commit 92b99ad2 authored by fallenstardust's avatar fallenstardust

添加分页查询卡组列表的请求参数

parent e2b1df9d
...@@ -75,6 +75,10 @@ public class DeckSquareApiUtil { ...@@ -75,6 +75,10 @@ public class DeckSquareApiUtil {
paramMap.put("page", condition.getPage()); paramMap.put("page", condition.getPage());
paramMap.put("size", condition.getSize()); paramMap.put("size", condition.getSize());
paramMap.put("keyWord", condition.getKeyWord());
paramMap.put("sortLike", condition.getSortLike());
paramMap.put("sortRank", condition.getSortRank());
paramMap.put("contributer", condition.getContributer());
Response response = OkhttpUtil.synchronousGet(url, paramMap, headers); Response response = OkhttpUtil.synchronousGet(url, paramMap, headers);
String responseBodyString = response.body().string(); String responseBodyString = response.body().string();
......
...@@ -23,6 +23,10 @@ public class DeckSquareFragment extends Fragment { ...@@ -23,6 +23,10 @@ public class DeckSquareFragment extends Fragment {
private DeckSquareListAdapter deckSquareListAdapter; private DeckSquareListAdapter deckSquareListAdapter;
private YGODeckDialogUtil.OnDeckMenuListener onDeckMenuListener;//通知外部调用方,(如调用本fragment的activity) private YGODeckDialogUtil.OnDeckMenuListener onDeckMenuListener;//通知外部调用方,(如调用本fragment的activity)
private YGODeckDialogUtil.OnDeckDialogListener mDialogListener; private YGODeckDialogUtil.OnDeckDialogListener mDialogListener;
private String keyWord;
private Boolean sortLike;
private Boolean sortRank;
private String contributer;
public DeckSquareFragment(YGODeckDialogUtil.OnDeckMenuListener onDeckMenuListener, YGODeckDialogUtil.OnDeckDialogListener mDialogListener) { public DeckSquareFragment(YGODeckDialogUtil.OnDeckMenuListener onDeckMenuListener, YGODeckDialogUtil.OnDeckDialogListener mDialogListener) {
this.onDeckMenuListener = onDeckMenuListener; this.onDeckMenuListener = onDeckMenuListener;
...@@ -53,9 +57,8 @@ public class DeckSquareFragment extends Fragment { ...@@ -53,9 +57,8 @@ public class DeckSquareFragment extends Fragment {
} }
binding.etGoToPage.setText(Integer.toString(targetPage)); binding.etGoToPage.setText(Integer.toString(targetPage));
deckSquareListAdapter.loadData(targetPage, 30); deckSquareListAdapter.loadData(targetPage, 30, "", false, false, "");
binding.listDeckInfo.scrollToPosition(0); binding.listDeckInfo.scrollToPosition(0);
return true; return true;
} }
...@@ -71,8 +74,7 @@ public class DeckSquareFragment extends Fragment { ...@@ -71,8 +74,7 @@ public class DeckSquareFragment extends Fragment {
} }
int newPage = targetPage + 1; int newPage = targetPage + 1;
deckSquareListAdapter.loadData(newPage, 30, "", false, false, "");
deckSquareListAdapter.loadData(newPage, 30);
binding.etGoToPage.setText(Integer.toString(newPage)); binding.etGoToPage.setText(Integer.toString(newPage));
binding.listDeckInfo.scrollToPosition(0); binding.listDeckInfo.scrollToPosition(0);
...@@ -91,7 +93,7 @@ public class DeckSquareFragment extends Fragment { ...@@ -91,7 +93,7 @@ public class DeckSquareFragment extends Fragment {
if (newPage < 1) { if (newPage < 1) {
newPage = 1; newPage = 1;
} }
deckSquareListAdapter.loadData(newPage, 30); deckSquareListAdapter.loadData(newPage, 30, "", false, false, "");
binding.etGoToPage.setText(Integer.toString(newPage)); binding.etGoToPage.setText(Integer.toString(newPage));
binding.listDeckInfo.scrollToPosition(0); binding.listDeckInfo.scrollToPosition(0);
...@@ -106,7 +108,7 @@ public class DeckSquareFragment extends Fragment { ...@@ -106,7 +108,7 @@ public class DeckSquareFragment extends Fragment {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
} }
deckSquareListAdapter.loadData(targetPage, 30); deckSquareListAdapter.loadData(targetPage, 30, "", false, false, "");
} }
}); });
deckSquareListAdapter.setOnItemLongClickListener((adapter, view, position) -> { deckSquareListAdapter.setOnItemLongClickListener((adapter, view, position) -> {
......
...@@ -30,13 +30,13 @@ public class DeckSquareListAdapter extends BaseQuickAdapter<OnlineDeckDetail, Ba ...@@ -30,13 +30,13 @@ public class DeckSquareListAdapter extends BaseQuickAdapter<OnlineDeckDetail, Ba
} }
public void loadData() { public void loadData() {
loadData(1, 30); loadData(1, 30, "", false, false, "");
} }
public void loadData(int page, int size) { public void loadData(Integer page, Integer size, String keyWord, Boolean sortLike, Boolean sortRank, String contributer) {
final DialogPlus dialog_read_ex = DialogPlus.show(getContext(), null, getContext().getString(R.string.fetch_online_deck)); final DialogPlus dialog_read_ex = DialogPlus.show(getContext(), null, getContext().getString(R.string.fetch_online_deck));
VUiKit.defer().when(() -> { VUiKit.defer().when(() -> {
SquareDeckResponse result = DeckSquareApiUtil.getSquareDecks(new GetSquareDeckCondition(page, size)); SquareDeckResponse result = DeckSquareApiUtil.getSquareDecks(new GetSquareDeckCondition(page, size, keyWord, sortLike, sortRank, contributer));
if (result == null) { if (result == null) {
return null; return null;
} else { } else {
......
...@@ -11,9 +11,13 @@ public class GetSquareDeckCondition { ...@@ -11,9 +11,13 @@ public class GetSquareDeckCondition {
public GetSquareDeckCondition() { public GetSquareDeckCondition() {
} }
public GetSquareDeckCondition(Integer page, Integer size) { public GetSquareDeckCondition(Integer page, Integer size, String keyWord, Boolean sortLike, Boolean sortRank, String contributer) {
this.page = page; this.page = page;
this.size = size; this.size = size;
this.keyWord = keyWord;
this.sortLike = sortLike;
this.sortRank = sortRank;
this.contributer = contributer;
} }
public Integer getPage() { public Integer getPage() {
......
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