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 20f8728d2..22062dc1d 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 @@ -698,9 +698,11 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void setMetadata() { + String title = mChannel == null ? "" : mChannel.getName(); + String artist = mChannel == null ? "" : mChannel.getData().getEpg(); MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder(); - builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, mChannel == null ? "" : mChannel.getName()); - builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, mChannel == null ? "" : mChannel.getData().getEpg()); + builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title); + builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist); 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 1c3c7076d..f89b59059 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 @@ -720,8 +720,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void onReset(boolean replay) { mClock.setCallback(null); - if (mFlagAdapter.getItemCount() == 0) return; - if (mEpisodeAdapter.getItemCount() == 0) return; + if (mFlagAdapter.isEmpty()) return; + if (mEpisodeAdapter.isEmpty()) return; getPlayer(getFlag(), getEpisode(), replay); } @@ -1108,9 +1108,12 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setMetadata() { + String title = mHistory == null ? getName() : mHistory.getVodName(); + String artist = mEpisodeAdapter.isEmpty() ? "" : getEpisode().getName(); + artist = title.equals(artist) ? "" : getString(R.string.play_now, artist); MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder(); - builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, mHistory == null ? getName() : mHistory.getVodName()); - builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, mEpisodeAdapter.getItemCount() == 0 ? "" : getString(R.string.play_now, getEpisode().getName())); + builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title); + builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist); builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, getIjk().getDefaultArtwork()); builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, mPlayers.getDuration()); mPlayers.setMetadata(builder.build()); @@ -1162,7 +1165,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void initParse() { - if (mParseAdapter.getItemCount() == 0) return; + if (mParseAdapter.isEmpty()) return; setParse(mParseAdapter.first()); } @@ -1173,7 +1176,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void checkSearch(boolean force) { - if (mQuickAdapter.getItemCount() == 0) initSearch(mBinding.name.getText().toString(), true); + if (mQuickAdapter.isEmpty()) initSearch(mBinding.name.getText().toString(), true); else if (isAutoMode() || force) nextSite(); } @@ -1242,7 +1245,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void nextSite() { - if (mQuickAdapter.getItemCount() == 0) return; + if (mQuickAdapter.isEmpty()) return; Vod item = mQuickAdapter.get(0); Notify.show(getString(R.string.play_switch_site, item.getSiteName())); mQuickAdapter.remove(0); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java index 9db8084bb..cf5f776f8 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java @@ -72,6 +72,10 @@ public class EpisodeAdapter extends RecyclerView.Adapter { return mItems; } + public boolean isEmpty() { + return getItemCount() == 0; + } + @Override public int getItemCount() { return mItems.size(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FlagAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FlagAdapter.java index f57c61ec8..f5efb921a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FlagAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/FlagAdapter.java @@ -61,6 +61,10 @@ public class FlagAdapter extends RecyclerView.Adapter { for (Flag item : mItems) Collections.reverse(item.getEpisodes()); } + public boolean isEmpty() { + return getItemCount() == 0; + } + @Override public int getItemCount() { return mItems.size(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/ParseAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/ParseAdapter.java index b2fccf59e..96f3fad1c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/ParseAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/ParseAdapter.java @@ -45,6 +45,10 @@ public class ParseAdapter extends RecyclerView.Adapter return mItems.get(0); } + public boolean isEmpty() { + return getItemCount() == 0; + } + @Override public int getItemCount() { return mItems.size(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/QuickAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/QuickAdapter.java index 5a02dc5ec..a3bf4f500 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/QuickAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/QuickAdapter.java @@ -47,6 +47,10 @@ public class QuickAdapter extends RecyclerView.Adapter notifyItemRemoved(position); } + public boolean isEmpty() { + return getItemCount() == 0; + } + @Override public int getItemCount() { return mItems.size();