From 2e7fca3845cb0f2a5a1df0c1009cd3ab0589ab03 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 26 Apr 2023 19:22:31 +0800 Subject: [PATCH] [mobile] update dev --- README.md | 1 + app/build.gradle | 2 +- other/sample/live/offline.json | 51 ++++++++++++++++++++++------------ other/sample/live/online.json | 49 +++++++++++++++++++++----------- other/sample/live/tvbus.json | 4 +-- 5 files changed, 70 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index c12679327..fcc354180 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ playerType:播放器 (1:IJK、2:EXO) ### 直播欄位
ua:用戶代理
+referer:參照位址
 epg:節目網址
 logo:台標網址
 boot:是否自動開啟
diff --git a/app/build.gradle b/app/build.gradle
index 9e4ab2809..f6d064ec2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         mobile {
             dimension "mode"
             versionCode 11
-            versionName "20230425#1"
+            versionName "20230426#1"
         }
         java {
             dimension "api"
diff --git a/other/sample/live/offline.json b/other/sample/live/offline.json
index 9c0968470..ec2809782 100644
--- a/other/sample/live/offline.json
+++ b/other/sample/live/offline.json
@@ -1,36 +1,53 @@
 {
   "lives": [
+    {
+      "name": "M3U",
+      "url": "file://Download/live.m3u"
+    },
     {
       "name": "TXT",
-      "type": 0,
       "url": "file://Download/live.txt",
-      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={name}&date={date}",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
+      "logo": "https://epg.112114.xyz/logo/{name}.png"
+    },
+    {
+      "name": "IJK",
+      "url": "file://Download/live.txt",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
       "logo": "https://epg.112114.xyz/logo/{name}.png",
-      "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
-      "boot": false
+      "playerType": 1
     },
     {
-      "name": "M3U",
-      "type": 0,
-      "url": "file://Download/live.m3u",
+      "name": "EXO",
+      "url": "file://Download/live.txt",
       "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
       "logo": "https://epg.112114.xyz/logo/{name}.png",
-      "ua": "okhttp/3.15",
-      "boot": false
+      "playerType": 2
     },
     {
-      "name": "IJK",
-      "type": 0,
-      "url": "file://Download/live.m3u",
-      "playerType": 1
+      "name": "PRO",
+      "boot": false,
+      "url": "file://Download/live.txt",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
+      "logo": "https://epg.112114.xyz/logo/{name}.png",
+      "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
+      "referer": "https://github.com/"
+    },
+    {
+      "name": "Custom",
+      "boot": false,
+      "url": "file://Download/live.txt",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
+      "logo": "https://epg.112114.xyz/logo/{name}.png",
+      "header": {
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
+        "referer": "https://github.com/"
+      }
     },
     {
       "name": "JSON",
       "type": 1,
-      "url": "file://Download/live.json",
-      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={epg}&date={date}",
-      "logo": "http://epg.51zmt.top:8000/{logo}",
-      "boot": false
+      "url": "file://Download/live.json"
     }
   ]
 }
\ No newline at end of file
diff --git a/other/sample/live/online.json b/other/sample/live/online.json
index d611bc7c1..c4fc40770 100644
--- a/other/sample/live/online.json
+++ b/other/sample/live/online.json
@@ -1,36 +1,53 @@
 {
   "lives": [
+    {
+      "name": "M3U",
+      "url": "https://github.com/live.m3u"
+    },
     {
       "name": "TXT",
-      "type": 0,
       "url": "https://github.com/live.txt",
-      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={name}&date={date}",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
+      "logo": "https://epg.112114.xyz/logo/{name}.png"
+    },
+    {
+      "name": "IJK",
+      "url": "https://github.com/live.txt",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
       "logo": "https://epg.112114.xyz/logo/{name}.png",
-      "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
-      "boot": false
+      "playerType": 1
     },
     {
-      "name": "M3U",
-      "type": 0,
-      "url": "https://github.com/live.m3u",
+      "name": "EXO",
+      "url": "https://github.com/live.txt",
       "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
       "logo": "https://epg.112114.xyz/logo/{name}.png",
-      "ua": "okhttp/3.15",
-      "boot": false
+      "playerType": 2
     },
     {
-      "name": "IJK",
-      "type": 0,
+      "name": "PRO",
+      "boot": false,
       "url": "https://github.com/live.txt",
-      "playerType": 1
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
+      "logo": "https://epg.112114.xyz/logo/{name}.png",
+      "ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
+      "referer": "https://github.com/"
+    },
+    {
+      "name": "Custom",
+      "boot": false,
+      "url": "https://github.com/live.txt",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
+      "logo": "https://epg.112114.xyz/logo/{name}.png",
+      "header": {
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
+        "referer": "https://github.com/"
+      }
     },
     {
       "name": "JSON",
       "type": 1,
-      "url": "https://github.com/live.json",
-      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={epg}&date={date}",
-      "logo": "http://epg.51zmt.top:8000/{logo}",
-      "boot": false
+      "url": "https://github.com/live.json"
     }
   ]
 }
\ No newline at end of file
diff --git a/other/sample/live/tvbus.json b/other/sample/live/tvbus.json
index 0c0f5dfc6..91ec818ae 100644
--- a/other/sample/live/tvbus.json
+++ b/other/sample/live/tvbus.json
@@ -2,11 +2,9 @@
   "lives": [
     {
       "name": "TXT",
-      "type": 0,
       "url": "https://github.com/live.txt",
-      "epg": "http://epg.51zmt.top:8000/api/diyp/?ch={name}&date={date}",
+      "epg": "https://epg.112114.xyz/?ch={name}&date={date}",
       "logo": "https://epg.112114.xyz/logo/{name}.png",
-      "boot": false,
       "core": {
         "auth": "",
         "name": "",