diff --git a/app/build.gradle b/app/build.gradle index ef040da..3aef7f5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,10 +42,10 @@ android { dependencies { implementation 'com.squareup.okhttp3:okhttp:' + okhttpVersion implementation 'com.github.thegrizzlylabs:sardine-android:0.9' - implementation 'wang.harlon.quickjs:wrapper-android:2.4.5' + implementation 'wang.harlon.quickjs:wrapper-android:3.2.0' implementation 'com.google.code.gson:gson:2.11.0' implementation 'cn.wanghaomiao:JsoupXpath:2.5.1' implementation 'com.hierynomus:smbj:0.14.0' implementation 'com.orhanobut:logger:2.2.0' - implementation 'org.jsoup:jsoup:1.18.3' + implementation 'org.jsoup:jsoup:1.19.1' } \ No newline at end of file diff --git a/app/src/main/java/com/github/catvod/bean/mqitv/Data.java b/app/src/main/java/com/github/catvod/bean/mqitv/Data.java index 0dac75f..d0015e6 100644 --- a/app/src/main/java/com/github/catvod/bean/mqitv/Data.java +++ b/app/src/main/java/com/github/catvod/bean/mqitv/Data.java @@ -22,7 +22,12 @@ public class Data { private Stat stat; public static Data objectFrom(String str) { - return new Gson().fromJson(str, Data.class); + try { + Data data = new Gson().fromJson(str, Data.class); + return data == null ? new Data() : data; + } catch (Exception e) { + return new Data(); + } } public List getData() { 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 fcbbe4a..c4d20bd 100644 --- a/app/src/main/java/com/github/catvod/spider/MQiTV.java +++ b/app/src/main/java/com/github/catvod/spider/MQiTV.java @@ -26,9 +26,10 @@ public class MQiTV extends Spider { } @Override - public String liveContent(String url) { + public String liveContent(String url) throws Exception { StringBuilder sb = new StringBuilder(); for (Config config : getConfigs()) { + if (config.getData().isEmpty()) continue; sb.append(config.getName()).append(",#genre#").append("\n"); boolean hasPort = config.getUri().getPort() != -1; for (Data item : config.getData()) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index c526922..0ed8fc2 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 8c029eb..1109034 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -b3f144d34651b79384fc9e1ca4e3e310 +77d675fab02d67f80e31fab7723eb15d