Fix bug and clean code

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

@@ -135,6 +135,12 @@ public class CollectActivity extends BaseActivity {
         }
     }
 
+    private void stop() {
+        if (mExecutor == null) return;
+        mExecutor.shutdownNow();
+        mExecutor = null;
+    }
+
     private void onChildSelected(@Nullable RecyclerView.ViewHolder child) {
         if (mOldView != null) mOldView.setActivated(false);
         if (child == null) return;
@@ -177,7 +183,13 @@ public class CollectActivity extends BaseActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        if (mExecutor != null) mExecutor.shutdownNow();
+        stop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        stop();
     }
 
     class PageAdapter extends FragmentStatePagerAdapter {

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

@@ -1053,7 +1053,9 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     }
 
     private void stopSearch() {
-        if (mExecutor != null) mExecutor.shutdownNow();
+        if (mExecutor == null) return;
+        mExecutor.shutdownNow();
+        mExecutor = null;
     }
 
     private void search(Site site, String keyword) {
@@ -1311,6 +1313,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
 
     @Override
     protected void onDestroy() {
+        stopSearch();
         super.onDestroy();
         mPlayers.release();
         Source.get().stop();

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

@@ -111,6 +111,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
     }
 
     public void setPlayer(int player) {
+        if (this.player != player) stop();
         this.player = player;
     }
 
@@ -210,12 +211,10 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
     }
 
     public void togglePlayer() {
-        stop();
         setPlayer(isExo() ? SYS : ++player);
     }
 
     public void nextPlayer() {
-        stop();
         setPlayer(isExo() ? IJK : EXO);
     }
 

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

@@ -3,6 +3,7 @@ package com.fongmi.android.tv.player;
 import com.fongmi.android.tv.player.extractor.BiliBili;
 import com.fongmi.android.tv.player.extractor.Force;
 import com.fongmi.android.tv.player.extractor.JianPian;
+import com.fongmi.android.tv.player.extractor.Push;
 import com.fongmi.android.tv.player.extractor.TVBus;
 import com.fongmi.android.tv.player.extractor.Thunder;
 import com.fongmi.android.tv.player.extractor.Youtube;
@@ -29,6 +30,7 @@ public class Source {
         extractors.add(new BiliBili());
         extractors.add(new Force());
         extractors.add(new JianPian());
+        extractors.add(new Push());
         extractors.add(new Thunder());
         extractors.add(new TVBus());
         extractors.add(new Youtube());

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

@@ -0,0 +1,33 @@
+package com.fongmi.android.tv.player.extractor;
+
+import android.net.Uri;
+import android.os.SystemClock;
+
+import androidx.fragment.app.FragmentActivity;
+
+import com.fongmi.android.tv.App;
+import com.fongmi.android.tv.player.Source;
+import com.fongmi.android.tv.ui.activity.DetailActivity;
+
+public class Push implements Source.Extractor {
+
+    @Override
+    public boolean match(String scheme, String host) {
+        return scheme.equals("push");
+    }
+
+    @Override
+    public String fetch(String url) throws Exception {
+        DetailActivity.push((FragmentActivity) App.activity(), Uri.parse(url.substring(7)));
+        SystemClock.sleep(500);
+        return "";
+    }
+
+    @Override
+    public void stop() {
+    }
+
+    @Override
+    public void exit() {
+    }
+}

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

@@ -239,6 +239,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT);
         mBinding.swipeLayout.setRefreshing(true);
         getIntent().putExtras(intent);
+        stopSearch();
         setOrient();
         checkId();
     }
@@ -1106,7 +1107,9 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     }
 
     private void stopSearch() {
-        if (mExecutor != null) mExecutor.shutdownNow();
+        if (mExecutor == null) return;
+        mExecutor.shutdownNow();
+        mExecutor = null;
     }
 
     private void search(Site site, String keyword) {
@@ -1430,6 +1433,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        stopSearch();
         mPlayers.release();
         Source.get().stop();
         Clock.get().release();