diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index b2abfbbab..a38a0e2a7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -339,7 +339,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List } private void setMetadata() { - mPlayers.setMetadata(mBinding.widget.title.getText().toString(), "", mBinding.exo); + mPlayers.setMetadata(mBinding.widget.title.getText().toString(), "", "", mBinding.exo); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 822191c9f..68845a5a6 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -718,9 +718,10 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void setMetadata() { + String logo = mChannel == null ? "" : mChannel.getLogo(); String title = mBinding.widget.name.getText().toString(); String artist = mBinding.widget.play.getText().toString(); - mPlayers.setMetadata(title, artist, mBinding.exo); + mPlayers.setMetadata(title, artist, logo, mBinding.exo); } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 1523d0540..280755e13 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1130,10 +1130,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void setMetadata() { + String logo = mHistory == null ? "" : mHistory.getVodPic(); String title = mHistory == null ? getName() : mHistory.getVodName(); String artist = mEpisodeAdapter.size() == 0 ? "" : getEpisode().getName(); artist = title.equals(artist) ? "" : getString(R.string.play_now, artist); - mPlayers.setMetadata(title, artist, mBinding.exo); + mPlayers.setMetadata(title, artist, logo, mBinding.exo); } @Subscribe(threadMode = ThreadMode.MAIN) 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 91b2d7a16..1356aff7a 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 @@ -441,13 +441,15 @@ public class Players implements Player.Listener, AnalyticsListener, ParseCallbac return bundle; } - public void setMetadata(String title, String artist, PlayerView view) { + public void setMetadata(String title, String artist, String logo, PlayerView view) { try { Bitmap bitmap = ((BitmapDrawable) view.getDefaultArtwork()).getBitmap(); MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder(); + builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, bitmap); builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title); builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist); - builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, bitmap); + builder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, logo); + builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, logo); builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, getDuration()); session.setMetadata(builder.build()); 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 b10543901..81871f4f4 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 @@ -777,9 +777,10 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void setMetadata() { + String logo = mChannel == null ? "" : mChannel.getLogo(); String title = mBinding.widget.name.getText().toString(); String artist = mBinding.widget.play.getText().toString(); - mPlayers.setMetadata(title, artist, mBinding.exo); + mPlayers.setMetadata(title, artist, logo, mBinding.exo); } @Subscribe(threadMode = ThreadMode.MAIN) 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 e11768511..83f2099c9 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 @@ -1140,10 +1140,11 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setMetadata() { + String logo = mHistory == null ? "" : mHistory.getVodPic(); String title = mHistory == null ? getName() : mHistory.getVodName(); String artist = mEpisodeAdapter.isEmpty() ? "" : getEpisode().getName(); artist = title.equals(artist) ? "" : getString(R.string.play_now, artist); - mPlayers.setMetadata(title, artist, mBinding.exo); + mPlayers.setMetadata(title, artist, logo, mBinding.exo); } @Subscribe(threadMode = ThreadMode.MAIN)