From 5fc01dbda35e0d049594a6e269c4b95d2aba00ef Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 14 Mar 2025 12:27:52 +0800 Subject: [PATCH] Add timeout for danmaku --- .../java/com/fongmi/android/tv/player/danmaku/Loader.java | 4 +++- catvod/src/main/java/com/github/catvod/net/OkHttp.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 f3de28fc1..e0fe0a51f 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 @@ -13,6 +13,8 @@ import master.flame.danmaku.danmaku.parser.android.AndroidFileSource; public class Loader implements ILoader { + private static final int TIMEOUT = 30 * 1000; + private AndroidFileSource dataSource; public Loader(Danmaku item) { @@ -27,7 +29,7 @@ public class Loader implements ILoader { public void load(String url) throws IllegalDataException { try { OkHttp.cancel("danmaku"); - load(OkHttp.newCall(UrlUtil.convert(url), "danmaku").execute().body().byteStream()); + load(OkHttp.newCall(OkHttp.client(TIMEOUT), UrlUtil.convert(url), "danmaku").execute().body().byteStream()); } catch (IOException e) { e.printStackTrace(); } diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java index 72c0145ff..2117aff08 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -144,6 +144,10 @@ public class OkHttp { return client.newCall(new Request.Builder().url(url).build()); } + public static Call newCall(OkHttpClient client, String url, String tag) { + return client.newCall(new Request.Builder().url(url).tag(tag).build()); + } + public static Call newCall(String url, Headers headers) { return client().newCall(new Request.Builder().url(url).headers(headers).build()); }