Clean code

app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java

@@ -38,7 +38,6 @@ import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.impl.SubtitleCallback;
 import com.fongmi.android.tv.player.ExoUtil;
 import com.fongmi.android.tv.player.Players;
-import com.fongmi.android.tv.player.Source;
 import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.ui.custom.CustomKeyDownCast;
 import com.fongmi.android.tv.ui.dialog.TrackDialog;
@@ -551,7 +550,6 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List
         super.onDestroy();
         mClock.release();
         mPlayers.release();
-        Source.get().stop();
         unbindService(this);
         mService.bindRealPlayer(null);
         App.removeCallbacks(mR1, mR2);

app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

@@ -46,7 +46,6 @@ import com.fongmi.android.tv.impl.SubtitleCallback;
 import com.fongmi.android.tv.model.LiveViewModel;
 import com.fongmi.android.tv.player.ExoUtil;
 import com.fongmi.android.tv.player.Players;
-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.CustomKeyDownLive;
@@ -1011,7 +1010,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
     protected void onDestroy() {
         super.onDestroy();
         mPlayers.release();
-        Source.get().stop();
         App.removeCallbacks(mR0, mR1, mR3, mR3, mR4);
     }
 }

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -1526,7 +1526,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         stopSearch();
         mClock.release();
         mPlayers.release();
-        Source.get().stop();
         RefreshEvent.history();
         App.removeCallbacks(mR1, mR2, mR3, mR4);
     }

app/src/main/java/com/fongmi/android/tv/player/Players.java

@@ -376,6 +376,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
         session.release();
         if (isExo()) releaseExo();
         if (isIjk()) releaseIjk();
+        App.execute(() -> Source.get().stop());
     }
 
     public void start(Channel channel, int timeout) {

app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java

@@ -48,7 +48,6 @@ import com.fongmi.android.tv.impl.SubtitleCallback;
 import com.fongmi.android.tv.model.LiveViewModel;
 import com.fongmi.android.tv.player.ExoUtil;
 import com.fongmi.android.tv.player.Players;
-import com.fongmi.android.tv.player.Source;
 import com.fongmi.android.tv.server.Server;
 import com.fongmi.android.tv.service.PlaybackService;
 import com.fongmi.android.tv.ui.adapter.ChannelAdapter;
@@ -1179,7 +1178,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
         super.onDestroy();
         mClock.release();
         mPlayers.release();
-        Source.get().stop();
         PlaybackService.stop();
         App.removeCallbacks(mR0, mR1, mR2, mR3);
         mViewModel.url.removeObserver(mObserveUrl);

app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java

@@ -16,7 +16,6 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.fragment.app.Fragment;
 import androidx.viewbinding.ViewBinding;
 
-import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.Updater;
 import com.fongmi.android.tv.api.config.LiveConfig;

app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

@@ -67,7 +67,6 @@ 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.Source;
-import com.fongmi.android.tv.utils.Timer;
 import com.fongmi.android.tv.service.PlaybackService;
 import com.fongmi.android.tv.ui.adapter.EpisodeAdapter;
 import com.fongmi.android.tv.ui.adapter.FlagAdapter;
@@ -92,6 +91,7 @@ import com.fongmi.android.tv.utils.Notify;
 import com.fongmi.android.tv.utils.PiP;
 import com.fongmi.android.tv.utils.ResUtil;
 import com.fongmi.android.tv.utils.Sniffer;
+import com.fongmi.android.tv.utils.Timer;
 import com.fongmi.android.tv.utils.Traffic;
 import com.fongmi.android.tv.utils.Util;
 import com.github.bassaer.library.MDColor;
@@ -1653,7 +1653,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
         mClock.release();
         mPlayers.release();
         Timer.get().reset();
-        Source.get().stop();
         RefreshEvent.history();
         App.removeCallbacks(mR0, mR1, mR2, mR3, mR4);
         mViewModel.result.removeObserver(mObserveDetail);

app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java

@@ -18,11 +18,11 @@ import com.fongmi.android.tv.bean.Parse;
 import com.fongmi.android.tv.databinding.ActivityVideoBinding;
 import com.fongmi.android.tv.databinding.DialogControlBinding;
 import com.fongmi.android.tv.player.Players;
-import com.fongmi.android.tv.utils.Timer;
 import com.fongmi.android.tv.ui.adapter.ParseAdapter;
 import com.fongmi.android.tv.ui.base.ViewType;
 import com.fongmi.android.tv.ui.custom.SpaceItemDecoration;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.fongmi.android.tv.utils.Timer;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.android.material.slider.Slider;