diff --git a/app/src/main/java/com/github/catvod/bean/Vod.java b/app/src/main/java/com/github/catvod/bean/Vod.java index e8494501..d85317e7 100644 --- a/app/src/main/java/com/github/catvod/bean/Vod.java +++ b/app/src/main/java/com/github/catvod/bean/Vod.java @@ -31,6 +31,8 @@ public class Vod { private String vodPlayUrl; @SerializedName("vod_tag") private String vodTag; + @SerializedName("action") + private String action; @SerializedName("style") private Style style; @@ -39,6 +41,12 @@ public class Vod { return item == null ? new Vod() : item; } + public static Vod action(String action) { + Vod vod = new Vod(); + vod.action = action; + return vod; + } + public Vod() { } @@ -55,6 +63,14 @@ public class Vod { setVodRemarks(vodRemarks); } + public Vod(String vodId, String vodName, String vodPic, String vodRemarks, String action) { + setVodId(vodId); + setVodName(vodName); + setVodPic(vodPic); + setVodRemarks(vodRemarks); + setAction(action); + } + public Vod(String vodId, String vodName, String vodPic, String vodRemarks, Style style) { setVodId(vodId); setVodName(vodName); @@ -63,6 +79,15 @@ public class Vod { setStyle(style); } + public Vod(String vodId, String vodName, String vodPic, String vodRemarks, Style style, String action) { + setVodId(vodId); + setVodName(vodName); + setVodPic(vodPic); + setVodRemarks(vodRemarks); + setStyle(style); + setAction(action); + } + public Vod(String vodId, String vodName, String vodPic, String vodRemarks, boolean folder) { setVodId(vodId); setVodName(vodName); @@ -131,6 +156,10 @@ public class Vod { this.vodTag = vodTag; } + public void setAction(String action) { + this.action = action; + } + public void setStyle(Style style) { this.style = style; } diff --git a/app/src/main/java/com/github/catvod/bean/market/Item.java b/app/src/main/java/com/github/catvod/bean/market/Item.java index f2b274c3..8e95b8a5 100644 --- a/app/src/main/java/com/github/catvod/bean/market/Item.java +++ b/app/src/main/java/com/github/catvod/bean/market/Item.java @@ -43,7 +43,7 @@ public class Item { } public Vod vod() { - return new Vod(getUrl(), getName(), getIcon(), getVersion(), Vod.Style.rect(1.0f)); + return new Vod("", getName(), getIcon(), getVersion(), Vod.Style.rect(1.0f), getUrl()); } @Override 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 1d43cad8..7825df27 100644 --- a/app/src/main/java/com/github/catvod/crawler/Spider.java +++ b/app/src/main/java/com/github/catvod/crawler/Spider.java @@ -58,6 +58,10 @@ public abstract class Spider { return null; } + public void action(String action) { + + } + 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 338cf790..6ad4d367 100644 --- a/app/src/main/java/com/github/catvod/spider/Market.java +++ b/app/src/main/java/com/github/catvod/spider/Market.java @@ -1,13 +1,11 @@ package com.github.catvod.spider; -import android.app.Activity; import android.app.ProgressDialog; import android.content.Context; import android.net.Uri; import com.github.catvod.bean.Class; import com.github.catvod.bean.Result; -import com.github.catvod.bean.Vod; import com.github.catvod.bean.market.Data; import com.github.catvod.bean.market.Item; import com.github.catvod.crawler.Spider; @@ -62,22 +60,8 @@ public class Market extends Spider { } @Override - public String detailContent(List ids) throws Exception { - Init.run(this::finish); - Vod vod = new Vod(); - vod.setVodPlayFrom("FongMi"); - vod.setVodPlayUrl("FongMi$FongMi"); - Init.execute(() -> download(ids.get(0))); - return Result.string(vod); - } - - private void finish() { - try { - Activity activity = Init.getActivity(); - if (activity != null) activity.finish(); - } catch (Exception e) { - e.printStackTrace(); - } + public void action(String action) { + Init.execute(() -> download(action)); } private void download(String url) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 64241e03..8237cf7d 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 27249a8d..8c584715 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -9420d75153250b3e5d548637b60f66ee +e0b5490f5bced400cec1f2513431f1d3 diff --git a/json/market.json b/json/market.json index cf5ce656..a32e9cdc 100644 --- a/json/market.json +++ b/json/market.json @@ -13,49 +13,49 @@ "list": [ { "name": "電視-java", - "url": "https://fm.caioa.link/main/apk/release/leanback-java-armeabi_v7a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-java-armeabi_v7a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", "version": "v7a" }, { "name": "電視-java", - "url": "https://fm.caioa.link/main/apk/release/leanback-java-arm64_v8a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-java-arm64_v8a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", "version": "v8a" }, { "name": "電視-py", - "url": "https://fm.caioa.link/main/apk/release/leanback-python-armeabi_v7a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-python-armeabi_v7a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", "version": "v7a" }, { "name": "電視-py", - "url": "https://fm.caioa.link/main/apk/release/leanback-python-arm64_v8a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-python-arm64_v8a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", "version": "v8a" }, { "name": "手機-java", - "url": "https://fm.caioa.link/main/apk/release/mobile-java-armeabi_v7a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-java-armeabi_v7a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", "version": "v7a" }, { "name": "手機-java", - "url": "https://fm.caioa.link/main/apk/release/mobile-java-arm64_v8a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-java-arm64_v8a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", "version": "v8a" }, { "name": "手機-py", - "url": "https://fm.caioa.link/main/apk/release/mobile-python-armeabi_v7a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-python-armeabi_v7a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", "version": "v7a" }, { "name": "手機-py", - "url": "https://fm.caioa.link/main/apk/release/mobile-python-arm64_v8a.apk", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-python-arm64_v8a.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", "version": "v8a" }