diff --git a/app/src/main/java/com/fongmi/android/tv/api/SoLoader.java b/app/src/main/java/com/fongmi/android/tv/api/SoLoader.java index c61a07be5..2af1d0bf1 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/SoLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/SoLoader.java @@ -5,7 +5,6 @@ import com.fongmi.android.tv.net.OKHttp; import com.fongmi.android.tv.utils.FileUtil; import java.io.File; -import java.io.IOException; public class SoLoader { @@ -25,26 +24,21 @@ public class SoLoader { } public void load() { - App.execute(() -> { - checkSo(exo); - checkSo(ijk); - }); + App.execute(() -> checkSo(exo)); + App.execute(() -> checkSo(ijk)); } private void checkSo(String name) { try { File file = new File(FileUtil.getLibDir(), name); - if (!file.exists()) download(file, name); + if (!file.exists()) remove(name.split("-")[0]); + if (!file.exists()) FileUtil.write(file, OKHttp.newCall(url + name).execute().body().bytes()); System.load(file.getAbsolutePath()); - } catch (Exception ignored) { + } catch (Throwable e) { + e.printStackTrace(); } } - private void download(File file, String name) throws IOException { - remove(name.split("-")[0]); - FileUtil.write(file, OKHttp.newCall(url + name).execute().body().bytes()); - } - private void remove(String name) { File directory = FileUtil.getLibDir(); for (File file : directory.listFiles()) { diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java index 4f687601e..885f6c998 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java @@ -173,12 +173,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { * Default library loader * Load them by yourself, if your libraries are not installed at default place. */ - private static final IjkLibLoader sLocalLibLoader = new IjkLibLoader() { - @Override - public void loadLibrary(String libName) throws UnsatisfiedLinkError, SecurityException { - System.loadLibrary(libName); - } - }; + private static final IjkLibLoader sLocalLibLoader = System::loadLibrary; private static volatile boolean mIsLibLoaded = false; public static void loadLibrariesOnce(IjkLibLoader libLoader) {