Merge branch 'dev' into release

4 years ago · bb515766a8
parent be2b32aa48 66a9a4144c
commit bb515766a8
6 changed files with 134 additions and 30 deletions
--- a/README.md
+++ b/README.md
@ -7,36 +7,12 @@ https://github.com/CatVodTVOfficial/CatVodTVJarLoader
 [TV-Java](https://github.com/FongMi/TV/blob/main/release/leanback-java.apk?raw=true "TV-Java")  
 [TV-Python](https://github.com/FongMi/TV/blob/main/release/leanback-python.apk?raw=true "TV-Python")  

-### Local Config Example
-    file://cat.json
+### Config Example
+[Vod-Online](other/vod-online.json)  
+[Vod-Offline](other/vod-offline.json)  
+[Live-Online](other/live-online.json)  
+[Live-Offline](other/live-offline.json)  

-```json
-{
-   "spider":"spider.jar",
-   "sites":[
-      {
-         "key":"one",
-         "name":"One",
-         "type":3,
-         "api":"csp_Csp",
-         "searchable":1,
-         "quickSearch":1,
-         "filterable":1,
-         "ext":"file://one.json"
-      },
-      {
-         "key":"two",
-         "name":"Two",
-         "type":3,
-         "api":"csp_XPath",
-         "searchable":1,
-         "quickSearch":1,
-         "filterable":1,
-         "ext":"two.json"
-      }
-   ]
-}
-```
 ### Subtitle Format
 In playerContent put "sub"

--- a/app/src/main/java/com/fongmi/android/tv/player/source/Force.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/source/Force.java
@ -37,7 +37,7 @@ public class Force {

    private void check() throws Exception {
        File file = FileUtil.getCacheFile("libmitv.so");
-        String url = "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/TV/release/release/libmitv.so";
+        String url = "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/TV/release/other/libmitv.so";
        if (!file.exists()) FileUtil.write(file, OKHttp.newCall(url).execute().body().bytes());
    }

--- a/other/live-offline.json
+++ b/other/live-offline.json
@ -0,0 +1,31 @@
+{
+  "lives": [
+    {
+      "group": "redirect",
+      "channels": [
+        {
+          "name": "redirect",
+          "urls": [
+            "proxy://do=live&type=txt&ext=ZmlsZTovL0Rvd25sb2FkL3JlZGlyZWN0LnR4dA=="
+          ]
+        }
+      ]
+    },
+    {
+      "name": "TXT",
+      "type": 0,
+      "url": "file://Download/live.txt",
+      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={name}&date={date}",
+      "logo": "",
+      "ua": ""
+    },
+    {
+      "name": "M3U",
+      "type": 0,
+      "url": "file://Download/live.m3u",
+      "epg": "https://epg.112114.xyz/?ch={name}",
+      "logo": "",
+      "ua": ""
+    }
+  ]
+}
--- a/other/live-online.json
+++ b/other/live-online.json
@ -0,0 +1,31 @@
+{
+  "lives": [
+    {
+      "group": "redirect",
+      "channels": [
+        {
+          "name": "redirect",
+          "urls": [
+            "proxy://do=live&type=txt&ext=aHR0cHM6Ly9naXRodWIuY29tL3JlZGlyZWN0LnR4dA=="
+          ]
+        }
+      ]
+    },
+    {
+      "name": "TXT",
+      "type": 0,
+      "url": "https://github.com/live.txt",
+      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={name}&date={date}",
+      "logo": "",
+      "ua": ""
+    },
+    {
+      "name": "M3U",
+      "type": 0,
+      "url": "https://github.com/live.m3u",
+      "epg": "https://epg.112114.xyz/?ch={name}",
+      "logo": "",
+      "ua": ""
+    }
+  ]
+}
--- a/other/vod-offline.json
+++ b/other/vod-offline.json
@ -0,0 +1,33 @@
+{
+  "spider": "file://Download/custom_spider.jar",
+  "sites": [
+    {
+      "key": "one",
+      "name": "One",
+      "type": 3,
+      "api": "csp_Csp",
+      "searchable": 1,
+      "filterable": 1,
+      "ext": "file://Download/one.json"
+    },
+    {
+      "key": "two",
+      "name": "Two",
+      "type": 3,
+      "api": "csp_Csp",
+      "searchable": 1,
+      "filterable": 1,
+      "ext": "file://Download/two.json"
+    },
+    {
+      "key": "extend",
+      "name": "Extend",
+      "type": 3,
+      "api": "csp_Csp",
+      "searchable": 1,
+      "filterable": 1,
+      "ext": "file://Download/extend.json",
+      "jar": "file://Download/extend.jar"
+    }
+  ]
+}
--- a/other/vod-online.json
+++ b/other/vod-online.json
@ -0,0 +1,33 @@
+{
+  "spider": "https://github.com/custom_spider.jar",
+  "sites": [
+    {
+      "key": "one",
+      "name": "One",
+      "type": 3,
+      "api": "csp_Csp",
+      "searchable": 1,
+      "filterable": 1,
+      "ext": "https://github.com/one.json"
+    },
+    {
+      "key": "two",
+      "name": "Two",
+      "type": 3,
+      "api": "csp_Csp",
+      "searchable": 1,
+      "filterable": 1,
+      "ext": "https://github.com/two.json"
+    },
+    {
+      "key": "extend",
+      "name": "Extend",
+      "type": 3,
+      "api": "csp_Csp",
+      "searchable": 1,
+      "filterable": 1,
+      "ext": "https://github.com/extend.json",
+      "jar": "https://github.com/extend.jar"
+    }
+  ]
+}