pull/171/head
FongMi 2 years ago
parent 977a593398
commit 02696ed5a3
  1. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
  2. 13
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  3. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.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

@ -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() {

@ -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);
}
}

Loading…
Cancel
Save