diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java index 1ca6c07b1..65b0dbfde 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java @@ -240,12 +240,12 @@ public class Vod implements Parcelable { } public String getVodPic(String pic) { - if (!TextUtils.isEmpty(pic)) setVodPic(pic); + if (getVodPic().isEmpty()) setVodPic(pic); return getVodPic(); } public String getVodName(String name) { - if (!TextUtils.isEmpty(name)) setVodName(name); + if (getVodName().isEmpty()) setVodName(name); return getVodName(); } 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 2dec1ed30..49a07a21d 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 @@ -186,6 +186,10 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo start(activity, key, id, name, pic, null, true); } + public static void download(Activity activity, String id, String name, String pic) { + start(activity, "push_agent", id, name, pic, null, false, true); + } + public static void start(Activity activity, String url) { start(activity, "push_agent", url, url, null); } @@ -199,7 +203,12 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } public static void start(Activity activity, String key, String id, String name, String pic, String mark, boolean collect) { + start(activity, key, id, name, pic, mark, collect, false); + } + + public static void start(Activity activity, String key, String id, String name, String pic, String mark, boolean collect, boolean download) { Intent intent = new Intent(activity, VideoActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra("download", download); intent.putExtra("collect", collect); intent.putExtra("mark", mark); intent.putExtra("name", name); @@ -269,6 +278,10 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo return getIntent().getBooleanExtra("collect", false); } + private boolean isFromDownload() { + return getIntent().getBooleanExtra("download", false); + } + private boolean isAutoRotate() { return Settings.System.getInt(getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) == 1; } @@ -547,6 +560,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setDetail(Vod item) { mBinding.progressLayout.showContent(); + if (isFromDownload()) item.setVodName(""); + if (isFromDownload()) item.setVodPic(""); mBinding.video.setTag(item.getVodPic(getPic())); mBinding.name.setText(item.getVodName(getName())); Downloader.get().image(item.getVodPic());