Update config

app/build.gradle

@@ -4,24 +4,30 @@ plugins {
 
 android {
     compileSdk 33
-    flavorDimensions "default"
+    flavorDimensions "mode", "api"
 
     defaultConfig {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 33
-        versionCode 37
-        versionName "1.3.7"
+        versionCode 38
+        versionName "1.3.8"
         resValue "string", "url", ""
         ndk { abiFilters "armeabi-v7a" }
     }
 
     productFlavors {
         leanback {
-            dimension "default"
+            dimension "mode"
         }
         mobile {
-            dimension "default"
+            dimension "mode"
+        }
+        java {
+            dimension = "api"
+        }
+        python {
+            dimension = "api"
         }
     }
 
@@ -45,13 +51,14 @@ android {
 
     android.applicationVariants.all { variant ->
         variant.outputs.all { output ->
-            outputFileName = "${variant.productFlavors[0].name}.apk"
+            outputFileName = "${variant.productFlavors[0].name}-${variant.productFlavors[1].name}.apk"
         }
     }
 }
 
 dependencies {
     implementation project(':catvod')
+    pythonImplementation project(':pyramid')
     implementation project(':exoplayer-library')
     implementation project(':exoplayer-extension-rtmp')
     implementation project(':exoplayer-extension-ffmpeg')

app/proguard-rules.pro

@@ -22,9 +22,12 @@
 -keepclassmembers,allowobfuscation class * { @org.simpleframework.xml.Path <fields>; }
 -keepclassmembers,allowobfuscation class * { @org.simpleframework.xml.ElementList <fields>; }
 
-# CatVod
--keep class com.github.catvod.crawler.** { *; }
-
 # OkHttp
 -dontwarn okhttp3.**
 -keep class okhttp3.** { *; }
+
+# CatVod
+-keep class com.github.catvod.crawler.** { *; }
+
+# Pyramid
+-keep class com.undcover.freedom.pyramid.** { *; }

app/src/main/java/com/fongmi/android/tv/utils/Updater.java

@@ -22,7 +22,9 @@ import java.util.concurrent.Executors;
 
 public class Updater implements View.OnClickListener {
 
-    private static final String URL = "https://raw.githubusercontent.com/FongMi/TV/release/release/leanback.json";
+    private static final String DEF = "https://raw.githubusercontent.com/FongMi/TV/release/release/";
+    private static final String URL = DEF + BuildConfig.FLAVOR_mode + ".json";
+    private static final String APK = DEF + BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + ".apk";
     private static final String PROXY = "https://ghproxy.com/";
 
     private final ExecutorService executor;
@@ -62,9 +64,8 @@ public class Updater implements View.OnClickListener {
             JSONObject object = new JSONObject(OKHttp.newCall(target).execute().body().string());
             String name = object.optString("name");
             String desc = object.optString("desc");
-            String url = object.optString("url");
             int code = object.optInt("code");
-            if (retry > 0) url = PROXY + url;
+            String url = retry > 0 ? PROXY + APK : APK;
             if (code <= BuildConfig.VERSION_CODE) FileUtil.clearDir(getApk());
             else FileUtil.write(getApk(), OKHttp.newCall(url).execute().body().bytes());
             if (getApk().exists() && Prefers.getUpdate()) handler.post(() -> checkActivity(name, desc));

app/src/main/res/values/strings.xml

@@ -36,7 +36,7 @@
     <string name="play_reset">Reset</string>
     <string name="play_tracks">Tracks</string>
     <string name="play_op">OP</string>
-    <string name="play_ed">OP</string>
+    <string name="play_ed">ED</string>
     <string name="play_reverse">Reverse</string>
     <string name="play_forward">→</string>
     <string name="play_backward">←</string>

pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java

@@ -7,8 +7,6 @@ import com.chaquo.python.Python;
 import com.chaquo.python.android.AndroidPlatform;
 import com.github.catvod.crawler.Spider;
 
-import java.util.List;
-
 public class Loader {
 
     private PyObject app;
@@ -23,11 +21,6 @@ public class Loader {
     public Spider spider(Context context, String ext) {
         if (app == null) init(context);
         String path = app.callAttr("downloadPlugin", cache, ext).toString();
-        PyObject pySpider = app.callAttr("loadFromDisk", path);
-        List<PyObject> dependencies = app.callAttr("getDependence", pySpider).asList();
-        for (PyObject dependence : dependencies) {
-            String api = dependence.toString();
-        }
-        return new PySpider(app, pySpider);
+        return new PySpider(app, app.callAttr("loadFromDisk", path));
     }
 }