pull/594/head
jhengazuki 4 months ago
parent df4005c078
commit 7a8c766415
  1. 4
      app/src/main/java/com/fongmi/android/tv/api/Decoder.java
  2. 3
      app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java
  3. 3
      app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java

@ -22,8 +22,8 @@ public class Decoder {
private static final Pattern JS_URI = Pattern.compile("\"(\\.|\\.\\.)/(.?|.+?)\\.js\\?(.?|.+?)\"");
public static String getJson(String url, String tag) throws Exception {
try (Response res = OkHttp.newCall(url, tag).execute()) {
public static String getJson(String url) throws Exception {
try (Response res = OkHttp.newCall(url).execute()) {
HttpUrl httpUrl = res.request().url();
int size = HttpUrl.parse(url).querySize();
if (httpUrl.querySize() == size) url = httpUrl.toString();

@ -115,8 +115,7 @@ public class LiveConfig {
private void loadConfig(Callback callback) {
try {
OkHttp.cancel("live");
parseConfig(Decoder.getJson(UrlUtil.convert(config.getUrl()), "live"), callback);
parseConfig(Decoder.getJson(UrlUtil.convert(config.getUrl())), callback);
} catch (Throwable e) {
if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(""));
else App.post(() -> callback.error(Notify.getError(R.string.error_config_get, e)));

@ -113,8 +113,7 @@ public class VodConfig {
private void loadConfig(Callback callback) {
try {
OkHttp.cancel("vod");
checkJson(Json.parse(Decoder.getJson(UrlUtil.convert(config.getUrl()), "vod")).getAsJsonObject(), callback);
checkJson(Json.parse(Decoder.getJson(UrlUtil.convert(config.getUrl()))).getAsJsonObject(), callback);
} catch (Throwable e) {
if (TextUtils.isEmpty(config.getUrl())) App.post(() -> callback.error(""));
else loadCache(callback, e);

Loading…
Cancel
Save