From 1c2c5484b312a6a41682b97b32f2a67d0b8f62b3 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 19 Feb 2025 15:58:08 +0800 Subject: [PATCH] Fix bug --- .../com/fongmi/android/tv/ui/activity/HomeActivity.java | 2 ++ .../fongmi/android/tv/player/exo/MediaSourceFactory.java | 2 +- .../com/fongmi/android/tv/ui/activity/MainActivity.java | 2 ++ catvod/src/main/java/com/github/catvod/net/OkDns.java | 4 ++++ catvod/src/main/java/com/github/catvod/net/OkHttp.java | 6 ++++++ .../github/catvod/net/interceptor/RequestInterceptor.java | 6 ++++++ 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index c6caa9209..b5cb50a5f 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -59,6 +59,7 @@ import com.fongmi.android.tv.utils.KeyUtil; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.UrlUtil; +import com.github.catvod.net.OkHttp; import com.google.common.collect.Lists; import org.greenrobot.eventbus.Subscribe; @@ -487,6 +488,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen WallConfig.get().clear(); LiveConfig.get().clear(); VodConfig.get().clear(); + OkHttp.get().clear(); AppDatabase.backup(); Server.get().stop(); Source.get().exit(); diff --git a/app/src/main/java/com/fongmi/android/tv/player/exo/MediaSourceFactory.java b/app/src/main/java/com/fongmi/android/tv/player/exo/MediaSourceFactory.java index 7fa6f988d..5945f9992 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/exo/MediaSourceFactory.java +++ b/app/src/main/java/com/fongmi/android/tv/player/exo/MediaSourceFactory.java @@ -83,7 +83,7 @@ public class MediaSourceFactory implements MediaSource.Factory { } private ExtractorsFactory getExtractorsFactory() { - if (extractorsFactory == null) extractorsFactory = new DefaultExtractorsFactory().setTsExtractorFlags(FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS).setTsExtractorTimestampSearchBytes(TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES * 3); + if (extractorsFactory == null) extractorsFactory = new DefaultExtractorsFactory().setTsExtractorFlags(FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS).setTsExtractorTimestampSearchBytes(TsExtractor.DEFAULT_TIMESTAMP_SEARCH_BYTES * 10); return extractorsFactory; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index 209128178..acc14f722 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -37,6 +37,7 @@ import com.fongmi.android.tv.ui.fragment.VodFragment; import com.fongmi.android.tv.utils.FileChooser; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.UrlUtil; +import com.github.catvod.net.OkHttp; import com.google.android.material.navigation.NavigationBarView; import org.greenrobot.eventbus.Subscribe; @@ -207,6 +208,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt WallConfig.get().clear(); LiveConfig.get().clear(); VodConfig.get().clear(); + OkHttp.get().clear(); AppDatabase.backup(); Source.get().exit(); Server.get().stop(); diff --git a/catvod/src/main/java/com/github/catvod/net/OkDns.java b/catvod/src/main/java/com/github/catvod/net/OkDns.java index 5ec3af70f..941d6a003 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkDns.java +++ b/catvod/src/main/java/com/github/catvod/net/OkDns.java @@ -25,6 +25,10 @@ public class OkDns implements Dns { this.doh = doh; } + public void clear() { + map.clear(); + } + public synchronized void addAll(List hosts) { for (String host : hosts) { if (!host.contains("=")) continue; 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 713d4ff58..cac8a9f6a 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -58,6 +58,12 @@ public class OkHttp { return Loader.INSTANCE; } + public void clear() { + dns().clear(); + selector().clear(); + requestInterceptor().clear(); + } + public void setDoh(Doh doh) { OkHttpClient c = new OkHttpClient.Builder().cache(new Cache(Path.doh(), CACHE)).build(); dns().setDoh(doh.getUrl().isEmpty() ? null : new DnsOverHttps.Builder().client(c).url(HttpUrl.get(doh.getUrl())).bootstrapDnsHosts(doh.getHosts()).build()); diff --git a/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java b/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java index f3fe86d1a..67d8cd7e9 100644 --- a/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java +++ b/catvod/src/main/java/com/github/catvod/net/interceptor/RequestInterceptor.java @@ -38,6 +38,12 @@ public class RequestInterceptor implements Interceptor { } } + public void clear() { + userMap.clear(); + authMap.clear(); + headerMap.clear(); + } + @NonNull @Override public Response intercept(@NonNull Chain chain) throws IOException {