Add so files

app/src/main/java/com/fongmi/android/tv/App.java

@@ -106,7 +106,6 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
         Notify.createChannel();
-        Github.setAbi(BuildConfig.FLAVOR_abi);
         Logger.addLogAdapter(getLogAdapter());
         OkHttp.get().setProxy(Setting.getProxy());
         OkHttp.get().setDoh(Doh.objectFrom(Setting.getDoh()));

app/src/main/java/com/fongmi/android/tv/player/extractor/Force.java

@@ -9,10 +9,8 @@ import android.os.SystemClock;
 
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.player.Source;
-import com.fongmi.android.tv.utils.UrlUtil;
 import com.forcetech.Util;
 import com.github.catvod.net.OkHttp;
-import com.github.catvod.utils.Github;
 import com.google.common.net.HttpHeaders;
 
 import java.util.HashSet;
@@ -29,12 +27,12 @@ public class Force implements Source.Extractor {
     }
 
     private void init(String scheme) {
-        App.get().bindService(Util.intent(App.get(), scheme, Github.getSo(scheme)), mConn, Context.BIND_AUTO_CREATE);
+        App.get().bindService(Util.intent(App.get(), scheme), mConn, Context.BIND_AUTO_CREATE);
     }
 
     @Override
     public String fetch(String url) throws Exception {
-        String scheme = UrlUtil.scheme(url);
+        String scheme = Util.scheme(url);
         if (!set.contains(scheme)) init(scheme);
         while (!set.contains(scheme)) SystemClock.sleep(10);
         Uri uri = Uri.parse(url);

catvod/src/main/java/com/github/catvod/utils/Github.java

@@ -1,5 +1,7 @@
 package com.github.catvod.utils;
 
+import android.net.Uri;
+
 import com.github.catvod.net.OkHttp;
 
 import java.io.File;
@@ -7,11 +9,6 @@ import java.io.File;
 public class Github {
 
     public static final String URL = "https://my.t4tv.hz.cz";
-    private static String ABI;
-
-    public static void setAbi(String abi) {
-        Github.ABI = abi.replace("_", "-");
-    }
 
     private static String getUrl(String path, String name) {
         return URL + "/" + path + "/" + name;
@@ -25,20 +22,14 @@ public class Github {
         return getUrl("apk/" + (dev ? "dev" : "release"), name + ".apk");
     }
 
-    public static String getSo(String name) {
+    public static String getSo(String url) {
         try {
-            File file = Path.so(name);
-            moveExist(Path.download(), file);
-            String url = name.startsWith("http") ? name : getUrl("so/" + ABI, file.getName());
+            File file = new File(Path.so(), Uri.parse(url).getLastPathSegment());
             if (file.length() < 300) Path.write(file, OkHttp.newCall(url).execute().body().bytes());
             return file.getAbsolutePath();
         } catch (Exception e) {
+            e.printStackTrace();
             return "";
         }
     }
-
-    private static void moveExist(File path, File file) {
-        File temp = new File(path, file.getName());
-        if (temp.exists()) Path.move(temp, file);
-    }
 }

catvod/src/main/java/com/github/catvod/utils/Path.java

@@ -1,6 +1,5 @@
 package com.github.catvod.utils;
 
-import android.net.Uri;
 import android.os.Environment;
 import android.util.Log;
 
@@ -42,10 +41,6 @@ public class Path {
         return Init.context().getFilesDir();
     }
 
-    public static File download() {
-        return Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-    }
-
     public static String rootPath() {
         return root().getAbsolutePath();
     }
@@ -102,11 +97,6 @@ public class Path {
         return new File(files(), name);
     }
 
-    public static File so(String name) {
-        if (name.startsWith("http")) return new File(so(), Uri.parse(name).getLastPathSegment());
-        return new File("mitv".equals(name) ? cache() : so(), "lib".concat(name).concat(".so"));
-    }
-
     public static File js(String name) {
         return new File(js(), name);
     }

forcetech/src/main/java/com/forcetech/Util.java

@@ -41,9 +41,9 @@ public class Util {
         return name.toLowerCase();
     }
 
-    public static Intent intent(Context context, String scheme, String path) {
+    public static Intent intent(Context context, String scheme) {
         Intent intent = new Intent(context, clz(scheme));
-        intent.putExtra("path", path);
+        intent.putExtra("scheme", scheme);
         return intent;
     }
 

forcetech/src/main/java/com/forcetech/android/ForceTV.java

@@ -4,7 +4,7 @@ public class ForceTV {
 
     public void start(String lib, int port) {
         try {
-            System.load(lib);
+            System.loadLibrary(lib);
             start(port, 20 * 1024 * 1024);
         } catch (Throwable ignored) {
         }

forcetech/src/main/java/com/forcetech/service/PxPService.java

@@ -23,7 +23,7 @@ public abstract class PxPService extends Service {
     @Override
     public IBinder onBind(Intent intent) {
         forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), getPort());
+        forceTV.start(intent.getStringExtra("scheme"), getPort());
         return binder;
     }
 

forcetech/src/main/java/com/gsoft/mitv/MainActivity.java

@@ -6,6 +6,9 @@ import android.os.IBinder;
 
 import com.anymediacloud.iptv.standard.ForceTV;
 import com.forcetech.Util;
+import com.github.catvod.utils.Path;
+
+import java.io.File;
 
 public class MainActivity extends Service {
 
@@ -14,11 +17,17 @@ public class MainActivity extends Service {
 
     public MainActivity() {
         try {
+            checkLibrary();
             System.loadLibrary("mitv");
         } catch (Throwable ignored) {
         }
     }
 
+    private void checkLibrary() throws Exception {
+        File cache = Path.cache("libmitv.so");
+        if (!cache.exists()) Path.copy(getAssets().open("libmitv.so"), cache);
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();

jianpian/src/main/java/com/p2p/P2PClass.java

@@ -1,6 +1,5 @@
 package com.p2p;
 
-import com.github.catvod.utils.Github;
 import com.github.catvod.utils.Path;
 
 public class P2PClass {
@@ -8,7 +7,7 @@ public class P2PClass {
     public int port;
 
     public P2PClass() {
-        System.load(Github.getSo("jpa"));
+        System.loadLibrary("jpa");
         this.port = P2Pdoxstarthttpd("TEST3E63BAAECDAA79BEAA91853490A69F08".getBytes(), Path.jpa().getAbsolutePath().getBytes());
     }
 

thunder/src/main/java/com/xunlei/downloadlib/XLLoader.java

@@ -1,6 +1,5 @@
 package com.xunlei.downloadlib;
 
-import com.github.catvod.utils.Github;
 import com.xunlei.downloadlib.parameter.BtIndexSet;
 import com.xunlei.downloadlib.parameter.BtSubTaskDetail;
 import com.xunlei.downloadlib.parameter.GetDownloadLibVersion;
@@ -14,8 +13,8 @@ import com.xunlei.downloadlib.parameter.XLTaskLocalUrl;
 class XLLoader {
 
     public XLLoader() {
-        System.load(Github.getSo("xl_stat"));
-        System.load(Github.getSo("xl_thunder_sdk"));
+        System.loadLibrary("xl_stat");
+        System.loadLibrary("xl_thunder_sdk");
     }
 
     public native int createBtMagnetTask(String str, String str2, String str3, GetTaskId getTaskId);