diff --git a/app/build.gradle b/app/build.gradle index 8ddf6301e..444c7ec3b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.exoplayer:exoplayer:2.18.1' implementation 'com.google.android.exoplayer:extension-rtmp:2.18.1' - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.9.1' implementation 'com.google.zxing:core:3.5.0' implementation 'com.makeramen:roundedimageview:2.3.0' implementation 'com.squareup.okhttp3:okhttp:4.10.0' diff --git a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java index 9bd38c404..5ed888051 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java @@ -27,7 +27,7 @@ public class ExoUtil { DataSource.Factory factory = getFactory(headers, url); MediaItem mediaItem = new MediaItem.Builder().setUri(videoUri).build(); int type = Util.inferContentType(videoUri); - if (type == C.CONTENT_TYPE_HLS || url.contains("php") || url.contains("m3u8") || Players.get().getRetry() > 0) { + if (type == C.CONTENT_TYPE_HLS || url.contains("php") || url.contains("m3u8")) { return new HlsMediaSource.Factory(factory).createMediaSource(mediaItem); } else if (type == C.CONTENT_TYPE_DASH) { return new DashMediaSource.Factory(factory).createMediaSource(mediaItem); diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java index 1c83e3196..277df709d 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java @@ -34,6 +34,7 @@ public class ImgUtil { return new RequestListener<>() { @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { + view.setScaleType(ImageView.ScaleType.CENTER); ImgUtil.onLoadFailed(vodName, view); return true; } @@ -50,10 +51,8 @@ public class ImgUtil { String text = vodName.isEmpty() ? "" : vodName.substring(0, 1); if (text.isEmpty()) { view.setImageResource(R.drawable.ic_img_error); - view.setScaleType(ImageView.ScaleType.CENTER); } else { - view.setImageDrawable(TextDrawable.builder().buildRect(text, ColorGenerator.MATERIAL.getColor(text))); - view.setScaleType(ImageView.ScaleType.CENTER_CROP); + view.setImageDrawable(TextDrawable.builder().beginConfig().width(view.getWidth()).height(view.getHeight()).endConfig().buildRect(text, ColorGenerator.MATERIAL.getColor(text))); } } } diff --git a/catvod/src/main/java/com/github/catvod/crawler/Spider.java b/catvod/src/main/java/com/github/catvod/crawler/Spider.java index 386ffd18f..48bc5e113 100644 --- a/catvod/src/main/java/com/github/catvod/crawler/Spider.java +++ b/catvod/src/main/java/com/github/catvod/crawler/Spider.java @@ -7,34 +7,34 @@ import java.util.List; public abstract class Spider { - public void init(Context context) { + public void init(Context context) throws Exception { } - public void init(Context context, String extend) { + public void init(Context context, String extend) throws Exception { init(context); } - public String homeContent(boolean filter) { + public String homeContent(boolean filter) throws Exception { return ""; } - public String homeVideoContent() { + public String homeVideoContent() throws Exception { return ""; } - public String categoryContent(String tid, String pg, boolean filter, HashMap extend) { + public String categoryContent(String tid, String pg, boolean filter, HashMap extend) throws Exception { return ""; } - public String detailContent(List ids) { + public String detailContent(List ids) throws Exception { return ""; } - public String searchContent(String key, boolean quick) { + public String searchContent(String key, boolean quick) throws Exception { return ""; } - public String playerContent(String flag, String id, List vipFlags) { + public String playerContent(String flag, String id, List vipFlags) throws Exception { return ""; } }