diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java index fe95a4c21..3a9900b9b 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java @@ -274,7 +274,7 @@ public class CollectActivity extends BaseActivity implements CustomScroller.Call @Override public void onItemClick(Vod item) { if (item.isFolder()) FolderActivity.start(this, item.getSiteKey(), Result.folder(item)); - else VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic()); + else VideoActivity.start(this, item.getSiteKey(), item.getVodId(), item.getVodName(), item.getVodPic(), true); } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 70afc7aa5..e1d77400e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -179,15 +179,20 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } public static void start(Activity activity, String key, String id, String name) { - start(activity, key, id, name, null, null); + start(activity, key, id, name, null, false, null); } public static void start(Activity activity, String key, String id, String name, String pic) { - start(activity, key, id, name, pic, null); + start(activity, key, id, name, pic, false, null); } - public static void start(Activity activity, String key, String id, String name, String pic, String mark) { + public static void start(Activity activity, String key, String id, String name, String pic, boolean collect) { + start(activity, key, id, name, pic, collect, null); + } + + public static void start(Activity activity, String key, String id, String name, String pic, boolean collect, String mark) { Intent intent = new Intent(activity, VideoActivity.class); + intent.putExtra("collect", collect); intent.putExtra("mark", mark); intent.putExtra("name", name); intent.putExtra("pic", pic); @@ -253,7 +258,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private boolean isFromCollect() { - return getCallingActivity() != null && getCallingActivity().getShortClassName().contains(CollectActivity.class.getSimpleName()); + return getIntent().getBooleanExtra("collect", false); } private boolean isAutoRotate() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java index 324a123e3..c4c9d9da8 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java @@ -215,7 +215,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac getVideo(item.getVodId(), "1"); } else { if (item.isManga()) DetailActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic()); - else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), isFolder() ? item.getVodName() : null); + else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), false, isFolder() ? item.getVodName() : null); } }