diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Danmaku.java b/app/src/main/java/com/fongmi/android/tv/bean/Danmaku.java index b17757407..599d20738 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Danmaku.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Danmaku.java @@ -6,8 +6,6 @@ import androidx.annotation.Nullable; import com.google.gson.annotations.SerializedName; -import java.io.File; - public class Danmaku { @SerializedName("name") @@ -18,27 +16,12 @@ public class Danmaku { private boolean selected; public static Danmaku from(String path) { - if (path.contains("://")) { - return http(path); - } else { - return file(path); - } - } - - public static Danmaku http(String path) { Danmaku danmaku = new Danmaku(); danmaku.setName(path); danmaku.setUrl(path); return danmaku; } - public static Danmaku file(String path) { - Danmaku danmaku = new Danmaku(); - danmaku.setName(new File(path).getName()); - danmaku.setUrl("file:/" + path); - return danmaku; - } - public static Danmaku empty() { return new Danmaku(); } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java index 521ab3ce0..6ff612fb6 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Sub.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Sub.java @@ -12,8 +12,6 @@ import com.fongmi.android.tv.utils.UrlUtil; import com.github.catvod.utils.Trans; import com.google.gson.annotations.SerializedName; -import java.io.File; - public class Sub { @SerializedName("url") @@ -28,28 +26,11 @@ public class Sub { private int flag; public static Sub from(String path) { - if (path.contains("://")) { - return http(path); - } else { - return file(path); - } - } - - private static Sub http(String path) { Uri uri = Uri.parse(path); Sub sub = new Sub(); sub.url = path; sub.name = uri.getLastPathSegment(); sub.flag = C.SELECTION_FLAG_FORCED; - sub.format = ExoUtil.getMimeType(uri.getLastPathSegment()); - return sub; - } - - private static Sub file(String path) { - Sub sub = new Sub(); - sub.url = "file:/" + path; - sub.name = new File(path).getName(); - sub.flag = C.SELECTION_FLAG_FORCED; sub.format = ExoUtil.getMimeType(sub.name); return sub; } diff --git a/app/src/main/java/com/fongmi/android/tv/player/danmaku/Loader.java b/app/src/main/java/com/fongmi/android/tv/player/danmaku/Loader.java index 79fb84864..0c2ccd39b 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/danmaku/Loader.java +++ b/app/src/main/java/com/fongmi/android/tv/player/danmaku/Loader.java @@ -28,6 +28,7 @@ public class Loader implements ILoader { public void load(String url) throws IllegalDataException { try { OkHttp.cancel("danmaku"); + if (url.startsWith("/")) url = "file:/" + url; load(OkHttp.newCall(OkHttp.client(Constant.TIMEOUT_DANMAKU), UrlUtil.convert(url), "danmaku").execute().body().byteStream()); } catch (IOException e) { e.printStackTrace();