diff --git a/app/src/main/java/com/github/catvod/crawler/JarLoader.java b/app/src/main/java/com/github/catvod/crawler/JarLoader.java index a8f5a9fe..f1d19871 100644 --- a/app/src/main/java/com/github/catvod/crawler/JarLoader.java +++ b/app/src/main/java/com/github/catvod/crawler/JarLoader.java @@ -68,7 +68,7 @@ public class JarLoader { public Spider getSpider(String key, String ext) { String clsKey = key.replace("csp_", ""); - if (spiders.contains(clsKey)) + if (spiders.containsKey(clsKey)) return spiders.get(clsKey); if (classLoader == null) return new SpiderNull(); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java index 4e96d5f6..e266cf99 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java @@ -256,6 +256,12 @@ public class DetailActivity extends BaseActivity { tvName.setText(mVideo.name); tvSite.setText(Html.fromHtml(getHtml("来源:", mVideo.sourceKey))); + for (SourceBean sourceBean : ApiConfig.get().getSourceBeanList()) { + if (sourceBean.getKey().equals(mVideo.sourceKey)) { + tvSite.setText(Html.fromHtml(getHtml("来源:", sourceBean.getName()))); + break; + } + } tvYear.setText(Html.fromHtml(getHtml("年份:", String.valueOf(mVideo.year)))); tvArea.setText(Html.fromHtml(getHtml("地区:", mVideo.area))); tvLang.setText(Html.fromHtml(getHtml("语言:", mVideo.lang))); @@ -325,6 +331,9 @@ public class DetailActivity extends BaseActivity { } private String getHtml(String label, String content) { + if (content == null) { + content = ""; + } return label + "" + content + ""; }