From 6e9db5fb92e5f6d1400b3292fce2d40eaa2bfacb Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 15 May 2025 23:56:16 +0800 Subject: [PATCH] Clean code --- .../fongmi/android/tv/ui/activity/VideoActivity.java | 6 +++--- .../fongmi/android/tv/ui/activity/VideoActivity.java | 10 +++++++--- .../fongmi/android/tv/ui/fragment/TypeFragment.java | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) 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 6fc5c1b79..190e815c5 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 @@ -153,11 +153,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } public static void cast(Activity activity, History history) { - start(activity, history.getSiteKey(), history.getVodId(), history.getVodName(), history.getVodPic(), null, true, false); + start(activity, history.getSiteKey(), history.getVodId(), history.getVodName(), history.getVodPic(), null, false, true); } public static void collect(Activity activity, String key, String id, String name, String pic) { - start(activity, key, id, name, pic, null, false, true); + start(activity, key, id, name, pic, null, true, false); } public static void start(Activity activity, String url) { @@ -176,7 +176,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List 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 cast, boolean collect) { + public static void start(Activity activity, String key, String id, String name, String pic, String mark, boolean collect, boolean cast) { Intent intent = new Intent(activity, VideoActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra("collect", collect); intent.putExtra("cast", cast); 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 d9f713169..bdad85358 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 @@ -170,15 +170,19 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } public static void start(Activity activity, String url) { - start(activity, "push_agent", url, url, null); + start(activity, "push_agent", url, url); } public static void start(Activity activity, String key, String id, String name) { - start(activity, key, id, name, null, null, false); + 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, String pic, String mark, boolean collect) { 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 656bc1480..720974371 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 @@ -230,7 +230,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac getVideo(item.getVodId(), "1"); } else { if (getSite().isIndex()) CollectActivity.start(getActivity(), item.getVodName()); - else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), isFolder() ? item.getVodName() : null, false); + else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), isFolder() ? item.getVodName() : null); } }