diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index cb821dc0b..600048b6a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -50,7 +50,7 @@ import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.model.SiteViewModel; import com.fongmi.android.tv.player.ExoUtil; import com.fongmi.android.tv.player.Players; -import com.fongmi.android.tv.player.extractor.Source; +import com.fongmi.android.tv.player.Source; import com.fongmi.android.tv.receiver.PiPReceiver; import com.fongmi.android.tv.service.PlaybackService; import com.fongmi.android.tv.ui.adapter.EpisodeAdapter; @@ -1391,9 +1391,9 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust @Override protected void onDestroy() { super.onDestroy(); - Source.stopAll(); mPlayers.release(); Clock.get().release(); + Source.get().destroy(); RefreshEvent.history(); PlaybackService.stop(); App.removeCallbacks(mR1, mR2, mR3, mR4); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 944bc8a79..27d217875 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -36,7 +36,7 @@ import com.fongmi.android.tv.impl.LiveCallback; import com.fongmi.android.tv.impl.PassCallback; import com.fongmi.android.tv.model.LiveViewModel; import com.fongmi.android.tv.player.Players; -import com.fongmi.android.tv.player.extractor.Source; +import com.fongmi.android.tv.player.Source; import com.fongmi.android.tv.receiver.PiPReceiver; import com.fongmi.android.tv.service.PlaybackService; import com.fongmi.android.tv.ui.adapter.ChannelAdapter; @@ -920,8 +920,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Override protected void onDestroy() { super.onDestroy(); - Source.stopAll(); mPlayers.release(); + Source.get().destroy(); PlaybackService.stop(); App.removeCallbacks(mR1, mR2, mR3); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index 262c04ae4..24ae42064 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -19,6 +19,7 @@ import com.fongmi.android.tv.api.WallConfig; import com.fongmi.android.tv.databinding.ActivityMainBinding; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.impl.Callback; +import com.fongmi.android.tv.player.Source; import com.fongmi.android.tv.server.Server; import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.ui.custom.FragmentStateManager; @@ -165,6 +166,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt WallConfig.get().clear(); LiveConfig.get().clear(); ApiConfig.get().clear(); + Source.get().release(); Server.get().stop(); } } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java index e51a2fe3b..6812af805 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java @@ -6,7 +6,6 @@ import android.view.LayoutInflater; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; -import com.fongmi.android.tv.App; import com.fongmi.android.tv.api.LiveConfig; import com.fongmi.android.tv.bean.Live; import com.fongmi.android.tv.databinding.DialogLiveBinding;