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 50522ecb..61639c6d 100644 --- a/app/src/main/java/com/github/catvod/spider/Market.java +++ b/app/src/main/java/com/github/catvod/spider/Market.java @@ -40,6 +40,7 @@ public class Market extends Spider { @Override public void init(Context context, String extend) throws Exception { + if (extend.startsWith("http")) extend = OkHttp.string(extend); datas = Data.arrayFrom(extend); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 664ee2a9..a8b72734 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 1d177ca5..7dcf93c4 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -53d68dba05ae31c36cf51a2c44c328e4 +b7b8097260fa9860d722b3dc231c0057 diff --git a/json/adult.json b/json/adult.json index 56371967..4dacd31d 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;53d68dba05ae31c36cf51a2c44c328e4", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;b7b8097260fa9860d722b3dc231c0057", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index 648e6ed2..0caab53a 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;53d68dba05ae31c36cf51a2c44c328e4", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;b7b8097260fa9860d722b3dc231c0057", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ { @@ -281,135 +281,11 @@ "api": "csp_Market", "searchable": 0, "changeable": 0, + "ext": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/market.json", "style": { "type": "rect", "ratio": 1 - }, - "ext": [ - { - "name": "推薦", - "list": [ - { - "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": "電視版", - "list": [ - { - "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": "手機版", - "list": [ - { - "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" - } - ] - } - ] + } } ], "doh": [