diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java index 2aaf55bad..bec6d60c2 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java @@ -126,7 +126,7 @@ public class EhPageLoader extends PageLoader2 implements SpiderQueen.OnSpiderLis @Override protected void onRequest(int index) { if (mSpiderQueen != null) { - Object object = mSpiderQueen.request(index); + Object object = mSpiderQueen.request(index, true); if (object instanceof Float) { notifyPagePercent(index, (Float) object); } else if (object instanceof String) { @@ -186,7 +186,9 @@ public class EhPageLoader extends PageLoader2 implements SpiderQueen.OnSpiderLis @Override public void onPageSuccess(int index, int finished, int downloaded, int total) { - notifyDataChanged(index); + if (mSpiderQueen != null) { + mSpiderQueen.request(index, false); + } } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java index cbb5f0964..3a5442c48 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java @@ -418,8 +418,8 @@ public final class SpiderQueen implements Runnable { return request(index, true, true, false); } - public Object request(int index) { - return request(index, true, false, true); + public Object request(int index, boolean addNeighbor) { + return request(index, true, false, addNeighbor); } private int getPageState(int index) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt index db4b3b248..f5ccdd848 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt @@ -42,10 +42,6 @@ abstract class PageLoader { state.compareAndSet(STATE_WAIT, STATE_READY) } - fun notifyDataChanged(index: Int) { - onRequest(index) - } - fun notifyPageWait(index: Int) { mPages[index].status.value = Page.State.QUEUE }