dongge
/
CatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Market support type

This commit is contained in:
FongMi 2023-10-19 11:51:45 +08:00
parent 4c71e6b98c
commit 96d688401b
7 changed files with 187 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/com/github/catvod/bean/market/Data.java Normal file
View File

@ -0,0 +1,45 @@
package com.github.catvod.bean.market;
import android.text.TextUtils;
import com.github.catvod.bean.Class;
import com.github.catvod.bean.Vod;
import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class Data {
@SerializedName("name")
private String name;
@SerializedName("list")
private List<Item> list;
public static List<Data> arrayFrom(String str) {
Type listType = new TypeToken<ArrayList<Data>>() {}.getType();
return new Gson().fromJson(str, listType);
}
public String getName() {
return TextUtils.isEmpty(name) ? "" : name;
}
public List<Item> getList() {
return list == null ? Collections.emptyList() : list;
}
public List<Vod> getVod() {
List<Vod> list = new ArrayList<>();
for (Item item : getList()) list.add(item.vod());
return list;
}
public Class type() {
return new Class(getName(), getName());
}
}

19
app/src/main/java/com/github/catvod/bean/market/Item.java
View File

@ -3,13 +3,7 @@ package com.github.catvod.bean.market;
import android.text.TextUtils; import android.text.TextUtils;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import com.google.gson.Gson;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import com.google.gson.reflect.TypeToken;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
public class Item { public class Item {
@ -19,11 +13,8 @@ public class Item {
private String url; private String url;
@SerializedName("icon") @SerializedName("icon")
private String icon; private String icon;
@SerializedName("version")
public static List<Item> arrayFrom(String str) { private String version;
Type listType = new TypeToken<ArrayList<Item>>() {}.getType();
return new Gson().fromJson(str, listType);
}
public String getName() { public String getName() {
return TextUtils.isEmpty(name) ? "" : name; return TextUtils.isEmpty(name) ? "" : name;
@ -37,7 +28,11 @@ public class Item {
return TextUtils.isEmpty(icon) ? "" : icon; return TextUtils.isEmpty(icon) ? "" : icon;
} }
public String getVersion() {
return TextUtils.isEmpty(version) ? "" : version;
}
public Vod vod() { public Vod vod() {
return new Vod(getUrl(), getName(), getIcon()); return new Vod(getUrl(), getName(), getIcon(), getVersion(), Vod.Style.rect(1.0f));
} }
} }

22
app/src/main/java/com/github/catvod/spider/Market.java
View File

@ -5,9 +5,10 @@ import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
import com.github.catvod.bean.Class;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
import com.github.catvod.bean.market.Item; import com.github.catvod.bean.market.Data;
import com.github.catvod.crawler.Spider; import com.github.catvod.crawler.Spider;
import com.github.catvod.net.OkHttp; import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.FileUtil; import com.github.catvod.utils.FileUtil;
@ -18,6 +19,7 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import okhttp3.Response; import okhttp3.Response;
@ -25,7 +27,7 @@ import okhttp3.Response;
public class Market extends Spider { public class Market extends Spider {
private ProgressDialog dialog; private ProgressDialog dialog;
private List<Item> items; private List<Data> datas;
private boolean busy; private boolean busy;
public boolean isBusy() { public boolean isBusy() {
@ -38,14 +40,20 @@ public class Market extends Spider {
@Override @Override
public void init(Context context, String extend) throws Exception { public void init(Context context, String extend) throws Exception {
items = Item.arrayFrom(extend); datas = Data.arrayFrom(extend);
} }
@Override @Override
public String homeVideoContent() { public String homeContent(boolean filter) throws Exception {
List<Vod> list = new ArrayList<>(); List<Class> classes = new ArrayList<>();
for (Item item : items) list.add(item.vod()); if (datas.size() > 1) for (int i = 1; i < datas.size(); i++) classes.add(datas.get(i).type());
return Result.string(list); return Result.string(classes, datas.get(0).getVod());
}
@Override
public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
for (Data data : datas) if (data.getName().equals(tid)) return Result.string(data.getVod());
return super.categoryContent(tid, pg, filter, extend);
} }
@Override @Override

BIN
jar/custom_spider.jar
View File

Binary file not shown.

2
jar/custom_spider.jar.md5
View File

@ -1 +1 @@
e7ecd94c00583729f5ee1a87370573ef 75e53be144f567045cf1de67327d5478

2
json/adult.json
View File

@ -1,5 +1,5 @@
{ {
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e7ecd94c00583729f5ee1a87370573ef", "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;75e53be144f567045cf1de67327d5478",
"wallpaper": "https://gao.chuqiuyu.tk", "wallpaper": "https://gao.chuqiuyu.tk",
"sites": [ "sites": [
{ {

158
json/config.json
View File

@ -1,5 +1,5 @@
{ {
"spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e7ecd94c00583729f5ee1a87370573ef", "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;75e53be144f567045cf1de67327d5478",
"wallpaper": "http://饭太硬.top/深色壁纸/api.php", "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
"sites": [ "sites": [
{ {
@ -287,49 +287,127 @@
}, },
"ext": [ "ext": [
{ {
"name": "電視-java-v7", "name": "推薦",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-java-armeabi_v7a.apk", "list": [
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png" {
"name": "電視-java-v7",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-java-armeabi_v7a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "電視-java-v8",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-java-arm64_v8a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "電視-py-v7",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-python-armeabi_v7a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "電視-py-v8",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-python-arm64_v8a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "Android-4.x",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/kitkat/leanback.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "手機-java-v7",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-java-armeabi_v7a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
"version": "2.0.7"
},
{
"name": "手機-java-v8",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-java-arm64_v8a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
"version": "2.0.7"
},
{
"name": "手機-py-v7",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-python-armeabi_v7a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
"version": "2.0.7"
},
{
"name": "手機-py-v8",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-python-arm64_v8a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
"version": "2.0.7"
}
]
}, },
{ {
"name": "電視-java-v8", "name": "電視版",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-java-arm64_v8a.apk", "list": [
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png" {
"name": "電視-java-v7",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-java-armeabi_v7a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "電視-java-v8",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-java-arm64_v8a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "電視-py-v7",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-python-armeabi_v7a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "電視-py-v8",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-python-arm64_v8a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
},
{
"name": "Android-4.x",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/kitkat/leanback.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png",
"version": "2.0.7"
}
]
}, },
{ {
"name": "電視-py-v7", "name": "手機版",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-python-armeabi_v7a.apk", "list": [
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png" {
}, "name": "手機-java-v7",
{ "url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-java-armeabi_v7a.apk",
"name": "電視-py-v8", "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/leanback-python-arm64_v8a.apk", "version": "2.0.7"
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png" },
}, {
{ "name": "手機-java-v8",
"name": "Android-4.x", "url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-java-arm64_v8a.apk",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/kitkat/leanback.apk", "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
"icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png" "version": "2.0.7"
}, },
{ {
"name": "手機-java-v7", "name": "手機-py-v7",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-java-armeabi_v7a.apk", "url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-python-armeabi_v7a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png" "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
}, "version": "2.0.7"
{ },
"name": "手機-java-v8", {
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-java-arm64_v8a.apk", "name": "手機-py-v8",
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png" "url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-python-arm64_v8a.apk",
}, "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png",
{ "version": "2.0.7"
"name": "手機-py-v7", }
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-python-armeabi_v7a.apk", ]
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png"
},
{
"name": "手機-py-v8",
"url": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/Release/main/apk/release/mobile-python-arm64_v8a.apk",
"icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png"
} }
] ]
} }