Merge pull request #427 from okcaptain/dev

Dev
pull/428/head^2
okcaptain 2 years ago committed by GitHub
commit ae270ba015
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      app/src/main/java/com/fongmi/android/tv/utils/M3U8.java
  2. 5
      ijkplayer/src/main/res/layout/ijk_player_view.xml

@ -22,7 +22,7 @@ public class M3U8 {
try {
if (TextUtils.isEmpty(url)) return "";
Response response = OkHttp.newCall(url, getHeader(headers)).execute();
if (response.header(HttpHeaders.ACCEPT_RANGES) != null && !url.contains(".m3u8")) return "";
if (response.header(HttpHeaders.ACCEPT_RANGES) != null) return "";
String result = response.body().string();
Matcher matcher = Pattern.compile("#EXT-X-STREAM-INF(.*)\\n?(.*)").matcher(result.replaceAll("\r\n", "\n"));
if (matcher.find() && matcher.groupCount() > 1) return get(UriUtil.resolve(url, matcher.group(2)), headers);

@ -3,8 +3,9 @@
<FrameLayout
android:id="@+id/ijk_content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/ijk_artwork"

Loading…
Cancel
Save