diff --git a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java index 698c311a..282ae1f3 100644 --- a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java +++ b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java @@ -157,7 +157,6 @@ public class ApiConfig { public void onSuccess(Response response) { try { String json = response.body(); - json = FindResult(json, configKey); parseJson(apiUrl, json); try { File cacheDir = cache.getParentFile(); @@ -199,8 +198,9 @@ public class ApiConfig { if (response.body() == null) { result = ""; } else { - result = response.body().string(); + result = FindResult(response.body().string(), configKey); } + if (apiUrl.startsWith("clan")) { result = clanContentFix(clanToAddress(apiUrl), result); } @@ -353,7 +353,7 @@ public class ApiConfig { // 直播源 liveChannelGroupList.clear(); //修复从后台切换重复加载频道列表 try { - String lives = infoJson.get("lives").getAsJsonArray().toString(); + String lives = infoJson.get("lives").getAsJsonArray().get(0).getAsJsonObject().toString(); int index = lives.indexOf("proxy://"); if (index != -1) { int endIndex = lives.lastIndexOf("\""); @@ -381,7 +381,7 @@ public class ApiConfig { liveChannelGroup.setGroupName(url); liveChannelGroupList.add(liveChannelGroup); } else { - if(lives.contains("group")){ + if(!lives.contains("type")){ loadLives(infoJson.get("lives").getAsJsonArray()); }else { JsonObject fengMiLives = infoJson.get("lives").getAsJsonArray().get(0).getAsJsonObject();