From 5e1f209ffdbccda48bc30dda17f1247d686d8ca9 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 9 Apr 2025 21:04:49 +0800 Subject: [PATCH] Clean code --- app/src/main/java/com/fongmi/android/tv/bean/Sub.java | 4 ++-- .../main/java/com/fongmi/android/tv/player/exo/ExoUtil.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) 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 cdd427917..e8a6e0e28 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 @@ -79,8 +79,8 @@ public class Sub { this.name = Trans.s2t(name); } - public MediaItem.SubtitleConfiguration getConfig(int id) { - return new MediaItem.SubtitleConfiguration.Builder(Uri.parse(getUrl())).setId(String.valueOf(id)).setLabel(getName()).setMimeType(getFormat()).setSelectionFlags(getFlag()).setLanguage(getLang()).build(); + public MediaItem.SubtitleConfiguration getConfig() { + return new MediaItem.SubtitleConfiguration.Builder(Uri.parse(getUrl())).setLabel(getName()).setMimeType(getFormat()).setSelectionFlags(getFlag()).setLanguage(getLang()).build(); } @Override diff --git a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java index bfb9abf26..369b90a58 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java @@ -39,8 +39,6 @@ import io.github.anilbeesetti.nextlib.media3ext.ffdecoder.NextRenderersFactory; public class ExoUtil { - private static int ID = 10000; - public static String getUa() { return Util.getUserAgent(App.get(), BuildConfig.APPLICATION_ID); } @@ -133,7 +131,7 @@ public class ExoUtil { private static List getSubtitleConfigs(List subs) { List configs = new ArrayList<>(); - for (Sub sub : subs) configs.add(sub.getConfig(++ID)); + if (subs != null) for (Sub sub : subs) configs.add(sub.getConfig()); return configs; }