diff --git a/app/src/main/java/com/github/catvod/bean/Result.java b/app/src/main/java/com/github/catvod/bean/Result.java index d27673d7..afbc8eb5 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -95,6 +95,10 @@ public class Result { return Result.get().vod(Collections.emptyList()).msg(msg).string(); } + public static String notify(String msg) { + return Result.get().msg(msg).string(); + } + public static Result get() { return new Result(); } diff --git a/app/src/main/java/com/github/catvod/crawler/Spider.java b/app/src/main/java/com/github/catvod/crawler/Spider.java index 7825df27..665e9fa7 100644 --- a/app/src/main/java/com/github/catvod/crawler/Spider.java +++ b/app/src/main/java/com/github/catvod/crawler/Spider.java @@ -58,8 +58,8 @@ public abstract class Spider { return null; } - public void action(String action) { - + public String action(String action) { + return null; } public void destroy() { diff --git a/app/src/main/java/com/github/catvod/spider/Market.java b/app/src/main/java/com/github/catvod/spider/Market.java index 6ad4d367..33a8d135 100644 --- a/app/src/main/java/com/github/catvod/spider/Market.java +++ b/app/src/main/java/com/github/catvod/spider/Market.java @@ -11,7 +11,6 @@ import com.github.catvod.bean.market.Item; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.FileUtil; -import com.github.catvod.utils.Notify; import com.github.catvod.utils.Path; import com.github.catvod.utils.Util; @@ -60,26 +59,23 @@ public class Market extends Spider { } @Override - public void action(String action) { - Init.execute(() -> download(action)); - } - - private void download(String url) { + public String action(String action) { try { - if (isBusy()) return; + if (isBusy()) return ""; setBusy(true); Init.run(this::setDialog, 500); - Response response = OkHttp.newCall(url); - File file = Path.create(new File(Path.download(), Uri.parse(url).getLastPathSegment())); + Response response = OkHttp.newCall(action); + File file = Path.create(new File(Path.download(), Uri.parse(action).getLastPathSegment())); download(file, response.body().byteStream(), Double.parseDouble(response.header("Content-Length", "1"))); if (file.getName().endsWith(".zip")) FileUtil.unzip(file, Path.download()); if (file.getName().endsWith(".apk")) FileUtil.openFile(file); - else Notify.show("下載完成"); - checkCopy(url); + else Result.notify("下載完成"); + checkCopy(action); dismiss(); + return ""; } catch (Exception e) { - Notify.show(e.getMessage()); dismiss(); + return Result.notify(e.getMessage()); } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 8237cf7d..73d81736 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 8c584715..6b57dea6 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -e0b5490f5bced400cec1f2513431f1d3 +3569e45ba9e1c3200bff36d96acf4241