diff --git a/app/src/leanback/AndroidManifest.xml b/app/src/leanback/AndroidManifest.xml
index d6053ab18..bc83fea36 100644
--- a/app/src/leanback/AndroidManifest.xml
+++ b/app/src/leanback/AndroidManifest.xml
@@ -16,6 +16,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <application android:banner="@drawable/ic_banner">
 
@@ -111,6 +112,7 @@
         <activity
             android:name=".ui.activity.VideoActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden|navigation"
+            android:launchMode="singleTop"
             android:screenOrientation="sensorLandscape" />
 
         <activity
@@ -132,6 +134,7 @@
         <activity
             android:name=".ui.activity.CollectActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
             android:screenOrientation="sensorLandscape" />
 
         <activity
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
index d9f352c0f..1f9a50cad 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
@@ -48,14 +48,9 @@ public class CollectActivity extends BaseActivity {
     private View mOldView;
 
     public static void start(Activity activity, String keyword) {
-        start(activity, keyword, false);
-    }
-
-    public static void start(Activity activity, String keyword, boolean clear) {
-        Intent intent = new Intent(activity, CollectActivity.class);
-        if (clear) intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        Intent intent = new Intent(activity, CollectActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra("keyword", keyword);
-        activity.startActivityForResult(intent, 1000);
+        activity.startActivity(intent);
     }
 
     private CollectFragment getFragment() {
@@ -71,6 +66,15 @@ public class CollectActivity extends BaseActivity {
         return mBinding = ActivityCollectBinding.inflate(getLayoutInflater());
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        getIntent().putExtras(intent);
+        mAdapter.clear();
+        setPager();
+        search();
+    }
+
     @Override
     protected void initView() {
         setRecyclerView();
@@ -169,14 +173,6 @@ public class CollectActivity extends BaseActivity {
         }
     };
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != RESULT_OK) return;
-        setResult(RESULT_OK);
-        finish();
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
index af8801796..c6caa9209 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
@@ -331,7 +331,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     public void onServerEvent(ServerEvent event) {
         switch (event.getType()) {
             case SEARCH:
-                CollectActivity.start(this, event.getText(), true);
+                CollectActivity.start(this, event.getText());
                 break;
             case PUSH:
                 VideoActivity.push(this, event.getText());
@@ -396,7 +396,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     public void onItemClick(Vod item) {
         if (item.isAction()) mViewModel.action(getHome().getKey(), item.getAction());
         else if (getHome().isIndex()) CollectActivity.start(getActivity(), item.getVodName());
-        else VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic());
+        else VideoActivity.start(this, getHome().getKey(), item.getVodId(), item.getVodName(), item.getVodPic());
     }
 
     @Override
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
index 368f0534a..d059e2fda 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java
@@ -54,7 +54,7 @@ public class PushActivity extends BaseActivity {
 
     private void onClip(View view) {
         CharSequence text = Util.getClipText();
-        if (!TextUtils.isEmpty(text)) VideoActivity.start(this, Sniffer.getUrl(text.toString()), false);
+        if (!TextUtils.isEmpty(text)) VideoActivity.start(this, Sniffer.getUrl(text.toString()));
     }
 
     private void onCode(View view) {
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 48d5fb71b..f496412fc 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -140,48 +140,35 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     public static void file(FragmentActivity activity, String path) {
         if (TextUtils.isEmpty(path)) return;
         String name = new File(path).getName();
-        PermissionX.init(activity).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> start(activity, "push_agent", "file://" + path, name, true));
+        PermissionX.init(activity).permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE).request((allGranted, grantedList, deniedList) -> start(activity, "push_agent", "file://" + path, name));
     }
 
     public static void cast(Activity activity, History history) {
-        start(activity, history.getSiteKey(), history.getVodId(), history.getVodName(), history.getVodPic(), null, true, true, false);
+        start(activity, history.getSiteKey(), history.getVodId(), history.getVodName(), history.getVodPic(), null, true, false);
     }
 
     public static void collect(Activity activity, String key, String id, String name, String pic) {
-        start(activity, key, id, name, pic, null, false, false, true);
+        start(activity, key, id, name, pic, null, false, true);
     }
 
     public static void start(Activity activity, String url) {
-        start(activity, url, true);
+        start(activity, "push_agent", url, url);
     }
 
-    public static void start(Activity activity, String url, boolean clear) {
-        start(activity, "push_agent", url, url, clear);
-    }
-
-    public static void start(Activity activity, String id, String name, String pic) {
-        start(activity, VodConfig.get().getHome().getKey(), id, name, pic);
+    public static void start(Activity activity, String key, String id, String name) {
+        start(activity, key, id, name, null);
     }
 
     public static void start(Activity activity, String key, String id, String name, String pic) {
-        start(activity, key, id, name, pic, null, false);
+        start(activity, key, id, name, pic, null);
     }
 
     public static void start(Activity activity, String key, String id, String name, String pic, String mark) {
-        start(activity, key, id, name, pic, mark, false);
-    }
-
-    public static void start(Activity activity, String key, String id, String name, boolean clear) {
-        start(activity, key, id, name, null, null, clear, false, false);
+        start(activity, key, id, name, pic, mark, false, false);
     }
 
-    public static void start(Activity activity, String key, String id, String name, String pic, String mark, boolean clear) {
-        start(activity, key, id, name, pic, mark, clear, false, false);
-    }
-
-    public static void start(Activity activity, String key, String id, String name, String pic, String mark, boolean clear, boolean cast, boolean collect) {
-        Intent intent = new Intent(activity, VideoActivity.class);
-        if (clear) intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    public static void start(Activity activity, String key, String id, String name, String pic, String mark, boolean cast, boolean collect) {
+        Intent intent = new Intent(activity, VideoActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra("collect", collect);
         intent.putExtra("cast", cast);
         intent.putExtra("mark", mark);
@@ -189,7 +176,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         intent.putExtra("pic", pic);
         intent.putExtra("key", key);
         intent.putExtra("id", id);
-        activity.startActivityForResult(intent, 1000);
+        activity.startActivity(intent);
     }
 
     private boolean isCast() {
@@ -264,6 +251,16 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         return mBinding = ActivityVideoBinding.inflate(getLayoutInflater());
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        String id = Objects.toString(intent.getStringExtra("id"), "");
+        if (TextUtils.isEmpty(id) || id.equals(getId())) return;
+        getIntent().putExtras(intent);
+        stopSearch();
+        checkId();
+    }
+
     @Override
     protected void initView() {
         mFrameParams = mBinding.video.getLayoutParams();
@@ -1367,16 +1364,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != RESULT_OK) return;
-        switch (requestCode) {
-            case 1000:
-                setResult(RESULT_OK);
-                finish();
-                break;
-            case 1001:
-                mPlayers.checkData(data);
-                break;
-        }
+        if (resultCode == RESULT_OK && requestCode == 1001) mPlayers.checkData(data);
     }
 
     @Override