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 eada442b..4cd9b78f 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 @@ -88,18 +88,21 @@ public class ApiConfig { String content = json; try { if (AES.isJson(content)) return content; + if(!content.startsWith("2423")){ + String[] data = json.split("\\*\\*"); + content = new String(Base64.decode(data[1], Base64.DEFAULT)); + } if (content.startsWith("2423")) { String data = content.substring(content.indexOf("2324") + 4, content.length() - 26); content = new String(AES.toBytes(content)).toLowerCase(); String key = AES.rightPadding(content.substring(content.indexOf("$#") + 2, content.indexOf("#$")), "0", 16); String iv = AES.rightPadding(content.substring(content.length() - 13), "0", 16); json = AES.CBC(data, key, iv); - }else if (content.startsWith("9864") && configKey !=null) { + }else if (configKey !=null && !AES.isJson(content)) { json = AES.ECB(content, configKey); } else{ - String[] data = json.split("\\*\\*"); - json = new String(Base64.decode(data[1], Base64.DEFAULT)); + json = content; } } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java index 7d275010..597786ac 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java @@ -964,7 +964,6 @@ public class PlayFragment extends BaseLazyFragment { // 解析ext try { HashMap reqHeaders = new HashMap<>(); - LOG.i("EXT:------------"+pb.getExt()); JSONObject jsonObject = new JSONObject(pb.getExt()); if (jsonObject.has("header")) { JSONObject headerJson = jsonObject.optJSONObject("header");