From cc9d194ddd8707d074143b8a1ced765842fe37fd Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 17 May 2014 21:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A2=84=E8=A7=88=E5=9B=BE?= =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/hippo/ehviewer/ListUrls.java | 33 ------------------- .../activity/DetailSectionFragment.java | 9 ++--- 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/src/com/hippo/ehviewer/ListUrls.java b/src/com/hippo/ehviewer/ListUrls.java index 5e6f6b975..58dfa66e4 100644 --- a/src/com/hippo/ehviewer/ListUrls.java +++ b/src/com/hippo/ehviewer/ListUrls.java @@ -46,39 +46,6 @@ public class ListUrls { private String search = null; - @Override - public boolean equals(Object object) { - if (!(object instanceof ListUrls)) - return false; - ListUrls listUrls = (ListUrls)object; - return page == listUrls.page && isSameUrls(listUrls); - } - - public boolean isSameUrls(ListUrls listUrls) { - if (type == listUrls.type) { - if ((search == null && listUrls.search != null) - || (search != null && listUrls.search == null)) - return false; - if (search != null && listUrls.search != null - && !search.equals(listUrls.search)) - return false; - if (advsearchType != listUrls.advsearchType) - return false; - if (minRating != listUrls.minRating) - return false; - return true; - } else - return false; - } - - @Override - public ListUrls clone() { - ListUrls listUrls = new ListUrls(type, search, page); - listUrls.setMax(max); - listUrls.setAdvance(advsearchType, minRating); - return listUrls; - } - public ListUrls() {} public ListUrls(int t) { diff --git a/src/com/hippo/ehviewer/activity/DetailSectionFragment.java b/src/com/hippo/ehviewer/activity/DetailSectionFragment.java index 495a89785..65152b041 100644 --- a/src/com/hippo/ehviewer/activity/DetailSectionFragment.java +++ b/src/com/hippo/ehviewer/activity/DetailSectionFragment.java @@ -299,12 +299,9 @@ public class DetailSectionFragment extends Fragment PreviewList pageList = mGalleryDetail.previewLists[mCurPage]; if (pageList == null) { - String tempUrl = mUrl; - if (!mUrl.endsWith("/")) - tempUrl += "/"; - tempUrl += "?p=" + mCurPage; - - mClient.getPageList(tempUrl, mCurPage, + mUrl = EhClient.getDetailUrl( + mGalleryDetail.gid, mGalleryDetail.token, mCurPage); + mClient.getPageList(mUrl, mCurPage, new EhClient.OnGetPageListListener() { @Override public void onSuccess(Object checkFlag, PreviewList pageList) {