diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index 32a9888f3..23d2b2256 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -49,7 +49,6 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic public static final int SOFT = 0; public static final int HARD = 1; - private MediaMetadataCompat metadata; private MediaSessionCompat session; private IjkVideoView ijkPlayer; private StringBuilder builder; @@ -129,7 +128,6 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic } public void setMetadata(MediaMetadataCompat metadata) { - this.metadata = metadata; session.setMetadata(metadata); ActionEvent.update(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index a413a2a10..20f8728d2 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -491,6 +491,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List public void onLoadFailed(@Nullable Drawable error) { getExo().setDefaultArtwork(error); getIjk().setDefaultArtwork(error); + setMetadata(); } }); } @@ -698,8 +699,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List private void setMetadata() { MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder(); - builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, mChannel.getName()); - builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, mChannel.getData().getEpg()); + builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, mChannel == null ? "" : mChannel.getName()); + builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, mChannel == null ? "" : mChannel.getData().getEpg()); builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, getIjk().getDefaultArtwork()); builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, mPlayers.getDuration()); mPlayers.setMetadata(builder.build()); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 7f843f10f..1c3c7076d 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -934,6 +934,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo getIjk().setDefaultArtwork(error); hideProgress(); hidePreview(); + setMetadata(); } }); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java b/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java index f322643b8..c393593cc 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java +++ b/app/src/mobile/java/com/fongmi/android/tv/utils/PiP.java @@ -27,10 +27,6 @@ public class PiP { private PictureInPictureParams.Builder builder; - public static boolean isIn(Activity activity) { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && activity.isInPictureInPictureMode(); - } - private boolean noPiP() { return Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !App.get().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) || !Setting.isBackgroundPiP(); }