Merge branch 'main' of https://github.com/FongMi/CatVodSpider

app/src/main/java/com/github/catvod/net/OkHttp.java

@@ -7,7 +7,6 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Call;
-import okhttp3.ConnectionPool;
 import okhttp3.Dns;
 import okhttp3.OkHttpClient;
 
@@ -33,7 +32,7 @@ public class OkHttp {
     }
 
     public static OkHttpClient.Builder getBuilder() {
-        return new OkHttpClient.Builder().dns(safeDns()).connectionPool(new ConnectionPool(20, 5, TimeUnit.MINUTES)).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).retryOnConnectionFailure(true).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert);
+        return new OkHttpClient.Builder().dns(safeDns()).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).retryOnConnectionFailure(true).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert);
     }
 
     private static OkHttpClient client() {

jar/custom_spider.jar.md5

@@ -1 +1 @@
-e4f7f2bc171ddcf963e249003caa9b40
+a84fef826cb82da525469e8acf1e7d9a

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e4f7f2bc171ddcf963e249003caa9b40",
+  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a84fef826cb82da525469e8acf1e7d9a",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "lives": [
     {
@@ -16,6 +16,7 @@
       "api": "csp_AList",
       "searchable": 1,
       "filterable": 1,
+      "switchable": 0,
       "ext": {
         "drives": [
           {
@@ -609,6 +610,7 @@
       "api": "csp_Push",
       "searchable": 1,
       "filterable": 1,
+      "switchable": 0,
       "ext": "http://我不是.肥猫.love:63/token.php"
     }
   ]

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;e4f7f2bc171ddcf963e249003caa9b40",
+  "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;a84fef826cb82da525469e8acf1e7d9a",
   "wallpaper": "http://www.kf666888.cn/api/tvbox/img",
   "lives": [
     {
@@ -18,6 +18,7 @@
       "api": "csp_AList",
       "searchable": 1,
       "filterable": 1,
+      "switchable": 0,
       "ext": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/alist.json"
     },
     {
@@ -27,6 +28,7 @@
       "api": "csp_Bili",
       "searchable": 1,
       "filterable": 1,
+      "switchable": 0,
       "ext": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/json/bili.json"
     },
     {
@@ -35,7 +37,8 @@
       "type": 3,
       "api": "csp_NiNi",
       "searchable": 1,
-      "filterable": 1
+      "filterable": 1,
+      "switchable": 1
     },
     {
       "key": "快播",
@@ -44,6 +47,7 @@
       "api": "https://www.kuaibozy.com/api.php/provide/vod/",
       "searchable": 1,
       "filterable": 0,
+      "switchable": 1,
       "categories": [
         "动漫",
         "国产剧",
@@ -69,6 +73,7 @@
       "api": "https://api.apibdzy.com/api.php/provide/vod/",
       "searchable": 1,
       "filterable": 0,
+      "switchable": 1,
       "categories": [
         "国产动漫",
         "日韩动漫",
@@ -91,7 +96,8 @@
       "type": 3,
       "api": "csp_Ying",
       "searchable": 1,
-      "filterable": 1
+      "filterable": 1,
+      "switchable": 1
     },
     {
       "key": "巴士",
@@ -99,7 +105,8 @@
       "type": 3,
       "api": "csp_Dm84",
       "searchable": 1,
-      "filterable": 1
+      "filterable": 1,
+      "switchable": 1
     },
     {
       "key": "異界",
@@ -107,7 +114,8 @@
       "type": 3,
       "api": "csp_Ysj",
       "searchable": 1,
-      "filterable": 1
+      "filterable": 1,
+      "switchable": 1
     },
     {
       "key": "紙條",
@@ -116,6 +124,7 @@
       "api": "csp_Paper",
       "searchable": 1,
       "filterable": 1,
+      "switchable": 0,
       "ext": "http://我不是.肥猫.love:63/token.php"
     },
     {
@@ -125,6 +134,7 @@
       "api": "csp_YiSo",
       "searchable": 1,
       "filterable": 0,
+      "switchable": 0,
       "ext": "http://我不是.肥猫.love:63/token.php"
     },
     {
@@ -134,6 +144,7 @@
       "api": "csp_PanSou",
       "searchable": 1,
       "filterable": 0,
+      "switchable": 0,
       "ext": "http://我不是.肥猫.love:63/token.php"
     },
     {
@@ -143,6 +154,7 @@
       "api": "csp_UpYun",
       "searchable": 1,
       "filterable": 0,
+      "switchable": 0,
       "ext": "http://我不是.肥猫.love:63/token.php"
     },
     {
@@ -152,6 +164,7 @@
       "api": "csp_Zhaozy",
       "searchable": 1,
       "filterable": 0,
+      "switchable": 0,
       "ext": "http://我不是.肥猫.love:63/token.php"
     },
     {
@@ -161,6 +174,7 @@
       "api": "csp_Live",
       "searchable": 0,
       "filterable": 0,
+      "switchable": 0,
       "ext": "2000"
     },
     {
@@ -170,6 +184,7 @@
       "api": "csp_Push",
       "searchable": 1,
       "filterable": 0,
+      "switchable": 0,
       "ext": "http://我不是.肥猫.love:63/token.php"
     }
   ]