From 86d2f3f5f8d38adfac34ecf8bd67d03754da1a81 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 8 Sep 2022 18:48:57 +0800 Subject: [PATCH] Update sort desc --- .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 5 +++-- app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java | 2 ++ app/src/main/java/com/fongmi/android/tv/player/Players.java | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) 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 d8f8c66d4..a3336d532 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 @@ -279,6 +279,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen private void reverseEpisode() { for (int i = 0; i < mFlagAdapter.size(); i++) Collections.reverse(((Vod.Flag) mFlagAdapter.get(i)).getEpisodes()); mEpisodeAdapter.setItems(getVodFlag().getEpisodes(), null); + setGroup(mEpisodeAdapter.size()); } private void setParseActivated(Parse item) { @@ -294,11 +295,11 @@ public class DetailActivity extends BaseActivity implements CustomKeyDown.Listen List items = new ArrayList<>(); items.add(getString(R.string.play_reverse)); items.add(getString(mHistory.getRevPlayText())); - int itemSize = (int) Math.ceil(size / 20.0f); - if (itemSize > 1) for (int i = 0; i < itemSize; i++) items.add(String.valueOf(i * 20 + 1)); mEpisodePresenter.setNextFocusDown(size > 1 ? R.id.group : R.id.part); mPartPresenter.setNextFocusUp(size > 1 ? R.id.group : R.id.episode); mBinding.group.setVisibility(size > 1 ? View.VISIBLE : View.GONE); + if (mHistory.isRevSort()) for (int i = size + 1; i > 0; i -= 20) items.add((i - 1) + "-" + Math.max(i - 20, 1)); + else for (int i = 0; i < size; i += 20) items.add((i + 1) + "-" + Math.min(i + 20, size)); mGroupAdapter.setItems(items, null); } 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 330504ca1..c8010a35c 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 @@ -5,6 +5,7 @@ import android.net.Uri; import com.fongmi.android.tv.App; import com.fongmi.android.tv.bean.Result; +import com.github.catvod.crawler.SpiderDebug; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultRenderersFactory; import com.google.android.exoplayer2.ExoPlayer; @@ -43,6 +44,7 @@ public class ExoUtil { } private static MediaSource getSource(Map headers, String url, MediaItem.SubtitleConfiguration config) { + SpiderDebug.log(url); Uri videoUri = Uri.parse(url); DataSource.Factory factory = getFactory(headers, url); MediaItem.Builder builder = new MediaItem.Builder().setUri(videoUri); 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 b8894aa4e..9c49f391f 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 @@ -9,7 +9,6 @@ import com.fongmi.android.tv.event.PlayerEvent; import com.fongmi.android.tv.ui.custom.CustomWebView; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.ResUtil; -import com.github.catvod.crawler.SpiderDebug; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; @@ -191,7 +190,6 @@ public class Players implements Player.Listener, ParseTask.Callback { public void onParseSuccess(Map headers, String url, String from) { if (from.length() > 0) Notify.show(ResUtil.getString(R.string.parse_from, from)); setMediaSource(headers, url); - SpiderDebug.log(url); } @Override