From d040769302aff1c389ee60d3dd050c85df3e3456 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 2 Oct 2022 00:21:10 +0800 Subject: [PATCH] Update glide to 4.14.1 --- app/build.gradle | 4 ++-- .../fongmi/android/tv/ui/activity/DetailActivity.java | 6 +++--- .../fongmi/android/tv/ui/activity/PushActivity.java | 2 +- .../java/com/fongmi/android/tv/player/ExoUtil.java | 10 +++------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f4041931a..47233e0bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation 'androidx.room:room-runtime:2.4.3' implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'com.github.bassaer:materialdesigncolors:1.0.0' - implementation 'com.github.bumptech.glide:glide:4.13.2' + implementation 'com.github.bumptech.glide:glide:4.14.1' 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' @@ -74,5 +74,5 @@ dependencies { implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' exclude group: 'xpp3', module: 'xpp3' } leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha02' annotationProcessor 'androidx.room:room-compiler:2.4.3' - annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2' + annotationProcessor 'com.github.bumptech.glide:compiler:4.14.1' } \ No newline at end of file diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 821246009..6f2deee91 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -196,13 +196,13 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen } private void setVideoView() { - getPlayerView().setVisibility(View.VISIBLE); getPlayerView().setPlayer(mPlayers.exo()); + getPlayerView().setVisibility(View.VISIBLE); getPlayerView().setResizeMode(Prefers.getScale()); getPlayerView().getSubtitleView().setStyle(ExoUtil.getCaptionStyle()); - mControl.speed.setText(mPlayers.getSpeed()); - mControl.scale.setText(ResUtil.getStringArray(R.array.select_scale)[Prefers.getScale()]); mControl.interval.setText(ResUtil.getString(R.string.second, Prefers.getInterval())); + mControl.scale.setText(ResUtil.getStringArray(R.array.select_scale)[Prefers.getScale()]); + mControl.speed.setText(mPlayers.getSpeed()); } private void setViewModel() { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java index c99ac8c18..fa879d855 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/PushActivity.java @@ -37,6 +37,6 @@ public class PushActivity extends BaseActivity { private void onClip(View view) { ClipData data = ((ClipboardManager) getSystemService(CLIPBOARD_SERVICE)).getPrimaryClip(); - if (data.getItemCount() > 0) DetailActivity.start(PushActivity.this, "push_agent", data.getItemAt(0).getText().toString()); + if (data != null && data.getItemCount() > 0) DetailActivity.start(this, "push_agent", data.getItemAt(0).getText().toString()); } } 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 115bd5713..7d58f3176 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 @@ -6,7 +6,6 @@ import android.net.Uri; import com.fongmi.android.tv.App; import com.fongmi.android.tv.bean.Result; import com.fongmi.android.tv.utils.FileUtil; -import com.github.catvod.crawler.SpiderDebug; import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.database.DatabaseProvider; import com.google.android.exoplayer2.database.StandaloneDatabaseProvider; @@ -45,13 +44,10 @@ public class ExoUtil { } private static MediaSource getSource(Map headers, String url, List config) { - SpiderDebug.log(url); - Uri videoUri = Uri.parse(url); - DataSource.Factory factory = getDataSourceFactory(headers); - MediaItem.Builder builder = new MediaItem.Builder().setUri(videoUri); + MediaItem.Builder builder = new MediaItem.Builder().setUri(Uri.parse(url)); if (url.contains("php") || url.contains("m3u8")) builder.setMimeType(MimeTypes.APPLICATION_M3U8); if (config.size() > 0) builder.setSubtitleConfigurations(config); - return new DefaultMediaSourceFactory(factory).createMediaSource(builder.build()); + return new DefaultMediaSourceFactory(getDataSourceFactory(headers)).createMediaSource(builder.build()); } private static List getConfig(Result result) { @@ -60,7 +56,7 @@ public class ExoUtil { String[] subs = result.getSub().split("\\$\\$\\$"); for (String sub : subs) { String[] divide = sub.split("#"); - items.add(new MediaItem.SubtitleConfiguration.Builder(Uri.parse(divide[2])).setLabel(divide[0]).setLanguage("zh").setMimeType(divide[1]).build()); + items.add(new MediaItem.SubtitleConfiguration.Builder(Uri.parse(divide[2])).setLabel(divide[0]).setMimeType(divide[1]).setLanguage("zh").build()); } return items; }