diff --git a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java index 9b249dd76..9a514cbf7 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java @@ -113,7 +113,7 @@ public class ExoUtil { private static MediaSource getSource(Map headers, String url, String format, List subs, Drm drm, int errorCode) { Uri uri = Uri.parse(url.trim().replace("\\", "")); String mimeType = getMimeType(format, errorCode); - if (uri.getUserInfo() != null) headers.put(HttpHeaders.AUTHORIZATION, "Basic " + Util.base64(uri.getUserInfo())); + if (uri.getUserInfo() != null) headers.put(HttpHeaders.AUTHORIZATION, Util.basic(uri)); return new DefaultMediaSourceFactory(getDataSourceFactory(headers), getExtractorsFactory()).createMediaSource(getMediaItem(uri, mimeType, subs, drm)); } 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 d87bc4933..fee5f8030 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -1,9 +1,12 @@ package com.github.catvod.net; +import android.net.Uri; import android.util.ArrayMap; import com.github.catvod.bean.Doh; import com.github.catvod.utils.Path; +import com.github.catvod.utils.Util; +import com.google.common.net.HttpHeaders; import java.util.Map; import java.util.Objects; @@ -62,7 +65,9 @@ public class OkHttp { } public static Call newCall(String url) { - return client().newCall(new Request.Builder().url(url).build()); + Uri uri = Uri.parse(url); + if (uri.getUserInfo() != null) return newCall(url, Headers.of(HttpHeaders.AUTHORIZATION, Util.basic(uri))); + return client().newCall(new Request.Builder().url(url).headers(Headers.of()).build()); } public static Call newCall(OkHttpClient client, String url) { diff --git a/catvod/src/main/java/com/github/catvod/utils/Util.java b/catvod/src/main/java/com/github/catvod/utils/Util.java index 9624ab94b..53d62198c 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Util.java +++ b/catvod/src/main/java/com/github/catvod/utils/Util.java @@ -65,6 +65,10 @@ public class Util { return host == null ? "" : host.toLowerCase().trim(); } + public static String basic(Uri uri) { + return "Basic " + base64(uri.getUserInfo()); + } + public static String md5(String src) { try { if (TextUtils.isEmpty(src)) return "";