From 49c96c547cc6c9ebc8b6d10febe3f4325657daf8 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 7 Sep 2023 14:39:01 +0800 Subject: [PATCH] Fix build --- .../android/tv/ui/activity/LiveActivity.java | 23 ++++++++++++++++++- .../android/tv/ui/activity/VideoActivity.java | 4 ++-- .../android/tv/ui/activity/LiveActivity.java | 1 + .../android/tv/ui/activity/VideoActivity.java | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) 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 60522b1af..42d5378a3 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 @@ -3,6 +3,7 @@ package com.fongmi.android.tv.ui.activity; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.view.KeyEvent; import android.view.View; @@ -19,6 +20,7 @@ import androidx.media3.ui.PlayerView; import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; +import com.bumptech.glide.request.transition.Transition; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.R; @@ -34,6 +36,7 @@ import com.fongmi.android.tv.databinding.ActivityLiveBinding; import com.fongmi.android.tv.event.ErrorEvent; import com.fongmi.android.tv.event.PlayerEvent; import com.fongmi.android.tv.impl.Callback; +import com.fongmi.android.tv.impl.CustomTarget; import com.fongmi.android.tv.impl.LiveCallback; import com.fongmi.android.tv.impl.PassCallback; import com.fongmi.android.tv.impl.SubtitleCallback; @@ -52,6 +55,7 @@ import com.fongmi.android.tv.ui.presenter.ChannelPresenter; import com.fongmi.android.tv.ui.presenter.GroupPresenter; import com.fongmi.android.tv.utils.Biometric; import com.fongmi.android.tv.utils.Clock; +import com.fongmi.android.tv.utils.ImgUtil; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Traffic; @@ -138,7 +142,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mR3 = this::setChannelActivated; mR4 = this::setTraffic; mHides = new ArrayList<>(); - mPlayers = new Players().init(); + mPlayers = new Players().init(this); mKeyDown = CustomKeyDownLive.create(this); mClock = Clock.create(mBinding.widget.time); mFormatDate = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()); @@ -436,6 +440,22 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick this.count = 0; } + private void setArtwork(String url) { + ImgUtil.load(url, R.drawable.radio, new CustomTarget<>() { + @Override + public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { + getExo().setDefaultArtwork(resource); + getIjk().setDefaultArtwork(resource); + } + + @Override + public void onLoadFailed(@Nullable Drawable error) { + getExo().setDefaultArtwork(error); + getIjk().setDefaultArtwork(error); + } + }); + } + @Override public void onItemClick(Group item) { mChannelAdapter.setItems(item.getChannel(), null); @@ -481,6 +501,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void setChannel(Channel item) { mPlayers.setPlayer(getPlayerType(item.getPlayerType())); + setArtwork(item.getLogo()); App.post(mR3, 100); mChannel = item; setPlayerView(); 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 b29df3297..fec372203 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 @@ -262,7 +262,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mKeyDown = CustomKeyDownVod.create(this, mBinding.video); mFrameParams = mBinding.video.getLayoutParams(); mClock = Clock.create(mBinding.widget.time); - mPlayers = new Players().init(); + mPlayers = new Players().init(this); mBroken = new ArrayList<>(); mR1 = this::hideControl; mR2 = this::setTraffic; @@ -861,7 +861,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void setArtwork(String url) { - ImgUtil.load(url, R.drawable.radio, new CustomTarget() { + ImgUtil.load(url, R.drawable.radio, new CustomTarget<>() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { getExo().setDefaultArtwork(resource); 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 22062dc1d..0aebcd6cf 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 @@ -706,6 +706,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, getIjk().getDefaultArtwork()); builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, mPlayers.getDuration()); mPlayers.setMetadata(builder.build()); + ActionEvent.update(); } @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 a3861b31f..19377a477 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 @@ -1117,6 +1117,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, getIjk().getDefaultArtwork()); builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, mPlayers.getDuration()); mPlayers.setMetadata(builder.build()); + ActionEvent.update(); } @Subscribe(threadMode = ThreadMode.MAIN)