diff --git a/app/src/main/java/com/github/catvod/spider/Local.java b/app/src/main/java/com/github/catvod/spider/Local.java index c8cb757..4875bcc 100644 --- a/app/src/main/java/com/github/catvod/spider/Local.java +++ b/app/src/main/java/com/github/catvod/spider/Local.java @@ -1,6 +1,7 @@ package com.github.catvod.spider; import android.content.Context; +import android.net.Uri; import android.os.Environment; import com.github.catvod.bean.Class; @@ -63,20 +64,34 @@ public class Local extends Spider { @Override public String detailContent(List ids) { - File file = new File(ids.get(0)); - Vod vod = new Vod(); - vod.setTypeName("FongMi"); - vod.setVodId(file.getAbsolutePath()); - vod.setVodName(file.getName()); - vod.setVodPic(Image.VIDEO); - vod.setVodPlayFrom("播放"); - vod.setVodPlayUrl(file.getName() + "$" + file.getAbsolutePath()); - return Result.string(vod); + String url = ids.get(0); + if (url.startsWith("http")) { + String name = Uri.parse(url).getLastPathSegment(); + return Result.string(create(name, url)); + } else { + File file = new File(ids.get(0)); + return Result.string(create(file.getName(), file.getAbsolutePath())); + } } @Override public String playerContent(String flag, String id, List vipFlags) throws Exception { - return Result.get().url("file://" + id).subs(getSubs(id)).string(); + if (id.startsWith("http")) { + return Result.get().url(id).string(); + } else { + return Result.get().url("file://" + id).subs(getSubs(id)).string(); + } + } + + private Vod create(String name, String url) { + Vod vod = new Vod(); + vod.setTypeName("FongMi"); + vod.setVodId(url); + vod.setVodName(name); + vod.setVodPic(Image.VIDEO); + vod.setVodPlayFrom("播放"); + vod.setVodPlayUrl(name + "$" + url); + return vod; } private Vod create(File file) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 5f76bd9..a413a81 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index ed5610e..62cffd9 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -28add647ed5a1ba17dad2874d0aa37fa +9cc15b83a755468e6b725667ef362a04