From 146672fcecd5f41f45601939319114fd5e8f8b34 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 5 Apr 2023 18:38:06 +0800 Subject: [PATCH] [mobile] update to 1.1.0 --- app/build.gradle | 12 ++++++------ .../main/java/com/fongmi/android/tv/bean/Vod.java | 2 +- .../java/com/fongmi/android/tv/player/ExoUtil.java | 2 +- .../tv/danmaku/ijk/media/player/ui/IjkVideoView.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fccbb08d3..51ef5f575 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,19 +16,19 @@ android { productFlavors { leanback { dimension "mode" - versionCode 71 - versionName "20230404#4" + versionCode 72 + versionName "1.7.2" } mobile { dimension "mode" - versionCode 9 - versionName "20230404#5" + versionCode 10 + versionName "1.1.0" } java { - dimension = "api" + dimension "api" } python { - dimension = "api" + dimension "api" } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java index f155344f4..a453e5d82 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java @@ -239,7 +239,7 @@ public class Vod { for (int i = 0; i < urls.length; i++) { String[] split = urls[i].split("\\$"); String number = String.format(Locale.getDefault(), "%02d", i + 1); - Episode episode = split.length > 1 ? new Vod.Flag.Episode(split[0].isEmpty() ? number : split[0].trim(), split[1].trim()) : new Vod.Flag.Episode(number, urls[i].trim()); + Episode episode = split.length > 1 ? new Vod.Flag.Episode(split[0].isEmpty() ? number : split[0].trim(), split[1]) : new Vod.Flag.Episode(number, urls[i]); if (!getEpisodes().contains(episode)) getEpisodes().add(episode); } } 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 ac62cc33f..b52b5b339 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 @@ -84,7 +84,7 @@ public class ExoUtil { } private static MediaItem getMediaItem(String url, List subs, int errorCode) { - MediaItem.Builder builder = new MediaItem.Builder().setUri(Uri.parse(url.replace("\\", ""))); + MediaItem.Builder builder = new MediaItem.Builder().setUri(Uri.parse(url.trim().replace("\\", ""))); if (errorCode == PlaybackException.ERROR_CODE_PARSING_MANIFEST_MALFORMED) builder.setMimeType(MimeTypes.APPLICATION_OCTET); else if (errorCode == PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED) builder.setMimeType(MimeTypes.APPLICATION_M3U8); if (subs.size() > 0) builder.setSubtitleConfigurations(getSubtitles(subs)); diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java index 03e6c00a5..8795f7f83 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java @@ -138,7 +138,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl } public void setMediaSource(String path, Map headers) { - setVideoURI(Uri.parse(path.replace("\\", "")), headers); + setVideoURI(Uri.parse(path.trim().replace("\\", "")), headers); } public void setVideoURI(Uri uri, Map headers) {