diff --git a/app/src/main/java/com/github/catvod/spider/MQiTV.java b/app/src/main/java/com/github/catvod/spider/MQiTV.java index fcb8ddaf..82e7e1ae 100644 --- a/app/src/main/java/com/github/catvod/spider/MQiTV.java +++ b/app/src/main/java/com/github/catvod/spider/MQiTV.java @@ -39,12 +39,17 @@ public class MQiTV extends Spider { public String liveContent(String url) { List data; StringBuilder sb = new StringBuilder(); - boolean fixed = ext.startsWith("http"); loadUser(data = Data.objectFrom(OkHttp.string(getHost() + "/api/post?item=itv_traffic")).getData()); - for (Data item : data) sb.append(item.getName()).append(",").append("proxy://do=mqitv").append("&id=").append(item.getId()).append("&playing=").append(item.getPlaying()).append("&port=").append(fixed ? item.getPort() : "5003").append("&type=m3u8").append("\n"); + for (Data item : data) sb.append(item.getName()).append(",").append(getProxyUrl(item)).append("\n"); return sb.toString(); } + private String getProxyUrl(Data item) { + boolean fixed = ext.startsWith("http"); + String port = fixed ? item.getPort() : "5003"; + return "proxy://do=mqitv" + "&id=" + item.getId() + "&ip=" + ext + "&playing=" + item.getPlaying() + "&port=" + port + "&type=m3u8"; + } + public static Object[] proxy(Map params) { String ip = params.get("ip"); String port = params.get("port"); @@ -97,9 +102,9 @@ public class MQiTV extends Spider { private static String getToken() { User user = choose(); - String url = String.format(Locale.getDefault(), "%s/HSAndroidLogin.ecgi?ty=json&net_account=%s&mac_address1=%s&_=%d", getHost(), user.getId(), user.getMac(), System.currentTimeMillis()); + String result = OkHttp.string(String.format(Locale.getDefault(), "%s/HSAndroidLogin.ecgi?ty=json&net_account=%s&mac_address1=%s&_=%d", getHost(), user.getId(), user.getMac(), System.currentTimeMillis())); Pattern pattern = Pattern.compile("\"Token\"\\s*:\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE); - Matcher matcher = pattern.matcher(OkHttp.string(url)); + Matcher matcher = pattern.matcher(result); return matcher.find() ? matcher.group(1) : ""; } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index c66602d7..8a912702 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index f68d7513..68778798 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -2fceaaa9b351c56808bd6c477f229348 +3f4ac4a1200a2e49dc6dfeee44d6384e