diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index cbf0f3338..5229bc186 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -37,3 +37,10 @@ -keep class tv.danmaku.ijk.media.player.** { *; } -keep class tv.danmaku.ijk.media.player.IjkMediaPlayer { *; } -keep class tv.danmaku.ijk.media.player.ffmpeg.FFmpegApi { *; } + +# TVBus +-keep class com.tvbus.engine.** { *; } + +# ZLive +-keep class com.sun.jna.** { *; } +-keep class com.east.android.zlive.** { *; } \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java index 7ae7d24fe..9e5e202d4 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java @@ -9,7 +9,6 @@ import com.fongmi.android.tv.bean.Keep; import com.fongmi.android.tv.bean.Live; import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.net.Callback; -import com.fongmi.android.tv.player.source.TVBus; import com.fongmi.android.tv.utils.Json; import com.fongmi.android.tv.utils.Prefers; import com.google.gson.JsonElement; @@ -173,7 +172,6 @@ public class LiveConfig { public void setHome(Live home) { this.home = home; this.home.setActivated(true); - TVBus.get().init(home.getCore()); config.home(home.getName()).update(); for (Live item : lives) item.setActivated(home); } diff --git a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java index b7423c71e..1eeb82ad6 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java @@ -26,6 +26,7 @@ public class LiveViewModel extends ViewModel { public void getLive(Live home) { execute(() -> { + TVBus.get().init(home.getCore()); LiveParser.start(home); return home; }); diff --git a/app/src/main/java/com/fongmi/android/tv/player/source/ZLive.java b/app/src/main/java/com/fongmi/android/tv/player/source/ZLive.java index 8ae86570d..61bcecb7e 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/source/ZLive.java +++ b/app/src/main/java/com/fongmi/android/tv/player/source/ZLive.java @@ -48,6 +48,7 @@ public class ZLive { public void stop() { try { if (init) com.east.android.zlive.ZLive.INSTANCE.OnLiveStop(); + init = false; } catch (Throwable e) { e.printStackTrace(); }