pull/102/head
FongMi 4 years ago
parent 0c4c9899c5
commit e4bbfca298
  1. 5
      app/src/main/java/com/fongmi/android/tv/bean/Result.java
  2. 4
      app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java

@ -63,7 +63,8 @@ public class Result {
public static Result fromJson(String str) {
try {
Type type = new TypeToken<LinkedHashMap<String, List<Filter>>>() {}.getType();
Type type = new TypeToken<LinkedHashMap<String, List<Filter>>>() {
}.getType();
Gson gson = new GsonBuilder().registerTypeAdapter(type, new FiltersAdapter()).create();
Result result = gson.fromJson(str, Result.class);
return result == null ? empty() : result;
@ -161,7 +162,7 @@ public class Result {
}
public String getSub() {
return sub;
return TextUtils.isEmpty(sub) ? "" : sub;
}
public Map<String, String> getHeaders() {

@ -1,7 +1,6 @@
package com.fongmi.android.tv.player;
import android.net.Uri;
import android.text.TextUtils;
import com.fongmi.android.tv.App;
import com.fongmi.android.tv.bean.Result;
@ -39,8 +38,7 @@ public class ExoUtil {
}
private static MediaItem.SubtitleConfiguration getConfig(Result result) {
if (TextUtils.isEmpty(result.getSub())) return null;
return new MediaItem.SubtitleConfiguration.Builder(Uri.parse(result.getSub())).setMimeType(MimeTypes.APPLICATION_SUBRIP).setSelectionFlags(C.SELECTION_FLAG_DEFAULT).build();
return result.getSub().isEmpty() ? null : new MediaItem.SubtitleConfiguration.Builder(Uri.parse(result.getSub())).setMimeType(MimeTypes.APPLICATION_SUBRIP).setSelectionFlags(C.SELECTION_FLAG_DEFAULT).build();
}
private static DataSource.Factory getFactory(Map<String, String> headers, String url) {

Loading…
Cancel
Save