Fix some bug

pull/102/head
FongMi 4 years ago
parent 34badbff5d
commit 1afcc2182a
  1. 2
      app/build.gradle
  2. 2
      app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java
  3. 5
      app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java
  4. 16
      catvod/src/main/java/com/github/catvod/crawler/Spider.java

@ -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'

@ -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);

@ -34,6 +34,7 @@ public class ImgUtil {
return new RequestListener<>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> 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)));
}
}
}

@ -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<String, String> extend) {
public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
return "";
}
public String detailContent(List<String> ids) {
public String detailContent(List<String> 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<String> vipFlags) {
public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
return "";
}
}

Loading…
Cancel
Save