Main

app/build.gradle

@@ -68,6 +68,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation files('libs\\thunder.jar')
 
     annotationProcessor 'androidx.room:room-compiler:2.3.0'
     implementation 'androidx.room:room-runtime:2.3.0'
@@ -85,15 +86,13 @@ dependencies {
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.orhanobut:hawk:2.0.1'
 
+    implementation project(":player")
+
     implementation('org.xwalk:xwalk_shared_library:23.53.589.4') {
         exclude group: 'com.android.support'
     }
     implementation 'com.lzy.net:okgo:3.0.4'
     // implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
-    implementation 'com.github.dueeeke.dkplayer:dkplayer-java:3.2.6'
-    implementation 'com.github.dueeeke.dkplayer:dkplayer-ui:3.2.6'
-    implementation 'com.github.dueeeke.dkplayer:player-exo:3.2.6'
-    implementation 'com.github.dueeeke.dkplayer:player-ijk:3.2.6'
     implementation 'com.owen:tv-recyclerview:3.0.0'
 
     implementation 'com.github.getActivity:XXPermissions:13.6'

app/proguard-rules.pro

@@ -90,6 +90,16 @@
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
+-keep public class * extends androidx.recyclerview.widget.RecyclerView$LayoutManager{
+    *** get*();
+    void set*(***);
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keep class com.orhanobut.hawk.** { *; }
+
 # 保留Parcelable序列化类不被混淆
 -keep class * implements android.os.Parcelable {
     public static final android.os.Parcelable$Creator *;

app/schemas/com.github.tvbox.osc.data.AppDataBase/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "7eeed1930e952258dac040695df9dd32",
+    "identityHash": "d1c2780b5424f0e960fe2364f63c86b8",
     "entities": [
       {
         "tableName": "cache",
@@ -32,7 +32,7 @@
       },
       {
         "tableName": "vodRecord",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `vodId` TEXT, `updateTime` INTEGER NOT NULL, `sourceKey` TEXT, `data` BLOB, `dataJson` TEXT, `testMigration` INTEGER NOT NULL)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `vodId` TEXT, `updateTime` INTEGER NOT NULL, `sourceKey` TEXT, `dataJson` TEXT)",
         "fields": [
           {
             "fieldPath": "id",
@@ -58,23 +58,11 @@
             "affinity": "TEXT",
             "notNull": false
           },
-          {
-            "fieldPath": "data",
-            "columnName": "data",
-            "affinity": "BLOB",
-            "notNull": false
-          },
           {
             "fieldPath": "dataJson",
             "columnName": "dataJson",
             "affinity": "TEXT",
             "notNull": false
-          },
-          {
-            "fieldPath": "testMigration",
-            "columnName": "testMigration",
-            "affinity": "INTEGER",
-            "notNull": true
           }
         ],
         "primaryKey": {
@@ -87,39 +75,51 @@
         "foreignKeys": []
       },
       {
-        "tableName": "sourceState",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`sourceKey` TEXT NOT NULL, `home` INTEGER NOT NULL, `active` INTEGER NOT NULL, `tidSort` TEXT, PRIMARY KEY(`sourceKey`))",
+        "tableName": "vodCollect",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `vodId` TEXT, `updateTime` INTEGER NOT NULL, `sourceKey` TEXT, `name` TEXT, `pic` TEXT)",
         "fields": [
           {
-            "fieldPath": "sourceKey",
-            "columnName": "sourceKey",
-            "affinity": "TEXT",
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
             "notNull": true
           },
           {
-            "fieldPath": "home",
-            "columnName": "home",
-            "affinity": "INTEGER",
-            "notNull": true
+            "fieldPath": "vodId",
+            "columnName": "vodId",
+            "affinity": "TEXT",
+            "notNull": false
           },
           {
-            "fieldPath": "active",
-            "columnName": "active",
+            "fieldPath": "updateTime",
+            "columnName": "updateTime",
             "affinity": "INTEGER",
             "notNull": true
           },
           {
-            "fieldPath": "tidSort",
-            "columnName": "tidSort",
+            "fieldPath": "sourceKey",
+            "columnName": "sourceKey",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pic",
+            "columnName": "pic",
             "affinity": "TEXT",
             "notNull": false
           }
         ],
         "primaryKey": {
           "columnNames": [
-            "sourceKey"
+            "id"
           ],
-          "autoGenerate": false
+          "autoGenerate": true
         },
         "indices": [],
         "foreignKeys": []
@@ -128,7 +128,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7eeed1930e952258dac040695df9dd32')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd1c2780b5424f0e960fe2364f63c86b8')"
     ]
   }
 }

app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
     <application
         android:name=".base.App"
         android:allowBackup="true"
+        android:banner="@drawable/app_banner"
         android:configChanges="orientation|keyboardHidden|screenSize"
         android:hardwareAccelerated="true"
         android:icon="@drawable/app_icon"
@@ -31,6 +32,7 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
 
@@ -44,7 +46,7 @@
             android:name=".ui.activity.PlayActivity"
             android:screenOrientation="landscape" />
         <activity
-            android:name=".ui.activity.ProjectionPlayActivity"
+            android:name=".ui.activity.PushActivity"
             android:screenOrientation="landscape" />
         <activity
             android:name=".ui.activity.SearchActivity"
@@ -55,6 +57,9 @@
         <activity
             android:name=".ui.activity.HistoryActivity"
             android:screenOrientation="landscape" />
+        <activity
+            android:name=".ui.activity.CollectActivity"
+            android:screenOrientation="landscape" />
 
         <receiver android:name=".receiver.SearchReceiver">
             <intent-filter>
@@ -66,11 +71,6 @@
                 <action android:name="android.content.movie.custom.web.Action" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".receiver.ProjectionReceiver">
-            <intent-filter>
-                <action android:name="android.content.movie.projection.Action" />
-            </intent-filter>
-        </receiver>
 
         <provider
             android:name="androidx.core.content.FileProvider"

app/src/main/java/com/github/catvod/crawler/JarLoader.java

@@ -7,7 +7,6 @@
 import org.json.JSONObject;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -24,32 +23,27 @@ public class JarLoader {
     /**
      * 不要在主线程调用我
      *
-     * @param jarData
+     * @param cache
      */
-    public boolean load(byte[] jarData) {
+    public boolean load(String cache) {
         spiders.clear();
         proxyFun = null;
         boolean success = false;
         try {
             File cacheDir = new File(App.getInstance().getCacheDir().getAbsolutePath() + "/catvod_csp");
             if (!cacheDir.exists())
                 cacheDir.mkdirs();
-            String cache = App.getInstance().getCacheDir().getAbsolutePath() + "/catvod_csp.jar";
-            FileOutputStream fos = new FileOutputStream(cache);
-            fos.write(jarData);
-            fos.flush();
-            fos.close();
             classLoader = new DexClassLoader(cache, cacheDir.getAbsolutePath(), null, App.getInstance().getClassLoader());
             // make force wait here, some device async dex load
             int count = 0;
             do {
                 try {
                     Class classInit = classLoader.loadClass("com.github.catvod.spider.Init");
                     if (classInit != null) {
-                        success = true;
                         Method method = classInit.getMethod("init", Context.class);
                         method.invoke(null, App.getInstance());
                         System.out.println("自定义爬虫代码加载成功!");
+                        success = true;
                         try {
                             Class proxy = classLoader.loadClass("com.github.catvod.spider.Proxy");
                             Method mth = proxy.getMethod("proxy", Map.class);
@@ -59,8 +53,6 @@ public boolean load(byte[] jarData) {
                         }
                         break;
                     }
-
-
                     Thread.sleep(200);
                 } catch (Throwable th) {
                     th.printStackTrace();
@@ -73,16 +65,16 @@ public boolean load(byte[] jarData) {
         return success;
     }
 
-    public Spider getSpider(String key, String ext) {
-        String clsKey = key.replace("csp_", "");
-        if (spiders.contains(clsKey))
-            return spiders.get(clsKey);
+    public Spider getSpider(String key, String cls, String ext) {
+        String clsKey = cls.replace("csp_", "");
+        if (spiders.containsKey(key))
+            return spiders.get(key);
         if (classLoader == null)
             return new SpiderNull();
         try {
             Spider sp = (Spider) classLoader.loadClass("com.github.catvod.spider." + clsKey).newInstance();
             sp.init(App.getInstance(), ext);
-            spiders.put(clsKey, sp);
+            spiders.put(key, sp);
             return sp;
         } catch (Throwable th) {
             th.printStackTrace();

app/src/main/java/com/github/catvod/crawler/Spider.java

@@ -2,11 +2,15 @@
 
 import android.content.Context;
 
+import com.github.tvbox.osc.util.OkGoHelper;
+
 import org.json.JSONObject;
 
 import java.util.HashMap;
 import java.util.List;
 
+import okhttp3.Dns;
+
 public abstract class Spider {
 
     public static JSONObject empty = new JSONObject();
@@ -100,4 +104,8 @@ public boolean isVideoFormat(String url) {
     public boolean manualVideoCheck() {
         return false;
     }
+
+    public static Dns safeDns() {
+        return OkGoHelper.dnsOverHttps;
+    }
 }