pull/586/head
FongMi 1 year ago
parent 23bbcf691a
commit e6c8e946f9
  1. 3
      app/src/main/java/com/fongmi/android/tv/api/LiveParser.java
  2. 16
      app/src/main/java/com/fongmi/android/tv/api/XtreamParser.java
  3. 2
      app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java

@ -146,8 +146,7 @@ public class LiveParser {
}
private static String getText(Live live) {
if (XtreamParser.isApiUrl(live.getUrl())) return "";
return getText(live.getUrl(), live.getHeaders()).replace("\r\n", "\n");
return live.isXtream() ? "" : getText(live.getUrl(), live.getHeaders()).replace("\r\n", "\n");
}
private static String getText(String url, Map<String, String> header) {

@ -18,20 +18,12 @@ public class XtreamParser {
return new HttpUrl.Builder().scheme(url.scheme()).host(url.host()).port(url.port());
}
public static boolean isVerify(Uri uri) {
return isApiUrl(uri) || isGetUrl(uri);
}
public static boolean isApiUrl(String url) {
return isApiUrl(Uri.parse(url));
public static boolean isVerify(String url) {
return isVerify(Uri.parse(url));
}
public static boolean isApiUrl(Uri uri) {
return uri.getPath() != null && uri.getPath().contains("player_api.php") && uri.getQueryParameter("username") != null && uri.getQueryParameter("password") != null;
}
public static boolean isGetUrl(Uri uri) {
return uri.getPath() != null && uri.getPath().contains("get.php") && uri.getQueryParameter("username") != null && uri.getQueryParameter("password") != null;
public static boolean isVerify(Uri uri) {
return uri.getPath() != null && uri.getQueryParameter("username") != null && uri.getQueryParameter("password") != null && (uri.getPath().contains("player_api.php") || uri.getPath().contains("get.php"));
}
public static String getEpgUrl(Live live) {

@ -114,7 +114,7 @@ public class LiveConfig {
private void loadConfig(Callback callback) {
try {
boolean xtream = XtreamParser.isApiUrl(config.getUrl());
boolean xtream = XtreamParser.isVerify(config.getUrl());
parseConfig(xtream ? "" : Decoder.getJson(config.getUrl()), callback);
} catch (Throwable e) {
if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(""));

Loading…
Cancel
Save