diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java index 37cee8129..7ef9a9ed6 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -6,7 +6,6 @@ import android.provider.Settings; import com.fongmi.android.tv.player.Players; import com.github.catvod.utils.Prefers; -import com.github.catvod.utils.Util; public class Setting { @@ -51,7 +50,7 @@ public class Setting { } public static String getUa() { - return Prefers.getString("ua", Util.CHROME); + return Prefers.getString("ua"); } public static void putUa(String ua) { diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index 97b42a656..3ffc3702b 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -361,9 +361,8 @@ public class Players implements Player.Listener, ParseCallback { } private Map checkUa(Map headers) { - if (Setting.getUa().isEmpty()) return headers; for (Map.Entry header : headers.entrySet()) if (HttpHeaders.USER_AGENT.equalsIgnoreCase(header.getKey())) return headers; - headers.put(HttpHeaders.USER_AGENT, Setting.getUa()); + headers.put(HttpHeaders.USER_AGENT, Setting.getUa().isEmpty() ? ExoUtil.getUa() : Setting.getUa()); return headers; } 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 a2e3ba9c0..9e7fce973 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 @@ -12,6 +12,7 @@ import androidx.media3.common.MimeTypes; import androidx.media3.common.PlaybackException; import androidx.media3.common.TrackSelectionOverride; import androidx.media3.common.Tracks; +import androidx.media3.common.util.Util; import androidx.media3.exoplayer.DefaultLoadControl; import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.exoplayer.LoadControl; @@ -22,6 +23,7 @@ import androidx.media3.exoplayer.trackselection.TrackSelector; import androidx.media3.ui.CaptionStyleCompat; import com.fongmi.android.tv.App; +import com.fongmi.android.tv.BuildConfig; import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.bean.Drm; import com.fongmi.android.tv.bean.Sub; @@ -35,6 +37,10 @@ import java.util.Map; public class ExoUtil { + public static String getUa() { + return Util.getUserAgent(App.get(), BuildConfig.APPLICATION_ID); + } + public static LoadControl buildLoadControl() { return new DefaultLoadControl(Setting.getBuffer()); }