From bd49ed7d5c8ac192fabd5607d150d903d06eaffe Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 23 Feb 2024 09:45:21 +0800 Subject: [PATCH] List of to asList --- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 2 +- app/src/main/java/com/fongmi/android/tv/bean/Flag.java | 3 ++- app/src/main/java/com/fongmi/android/tv/bean/Result.java | 7 ++++--- .../com/fongmi/android/tv/player/extractor/Thunder.java | 3 ++- .../java/com/fongmi/android/tv/ui/dialog/TrackDialog.java | 3 ++- .../mobile/java/com/fongmi/android/tv/cast/ScanTask.java | 3 ++- .../com/fongmi/android/tv/ui/activity/ScanActivity.java | 3 ++- 7 files changed, 15 insertions(+), 9 deletions(-) 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 2c0bea73a..3776fc317 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 @@ -1163,7 +1163,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List @Override public void onFailure(@NonNull Call call, @NonNull IOException e) { - List items = List.of(source); + List items = Arrays.asList(source); App.post(() -> setPartAdapter(items)); } }); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java index 495d5e8cc..37776aaf2 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java @@ -15,6 +15,7 @@ import org.simpleframework.xml.Attribute; import org.simpleframework.xml.Text; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -118,7 +119,7 @@ public class Flag implements Parcelable { public static List create(String flag, String name, String url) { Flag item = Flag.create(flag); item.getEpisodes().add(Episode.create(name, url)); - return List.of(item); + return Arrays.asList(item); } @Override diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java index 3e2190ee0..489496f24 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java @@ -23,6 +23,7 @@ import org.simpleframework.xml.Root; import org.simpleframework.xml.core.Persister; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; @@ -125,13 +126,13 @@ public class Result implements Parcelable { type.setTypeFlag("1"); type.setTypeId(item.getVodId()); type.setTypeName(item.getVodName()); - result.setTypes(List.of(type)); + result.setTypes(Arrays.asList(type)); return result; } public static Result type(String json) { Result result = new Result(); - result.setTypes(List.of(Class.objectFrom(json))); + result.setTypes(Arrays.asList(Class.objectFrom(json))); return result.trans(); } @@ -142,7 +143,7 @@ public class Result implements Parcelable { } public static Result vod(Vod item) { - return list(List.of(item)); + return list(Arrays.asList(item)); } public Result() { diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java index a2f5f051d..080e9388d 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java +++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/Thunder.java @@ -18,6 +18,7 @@ import com.xunlei.downloadlib.parameter.XLTaskInfo; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.concurrent.Callable; @@ -90,7 +91,7 @@ public class Thunder implements Source.Extractor { boolean torrent = Sniffer.isTorrent(url); List episodes = new ArrayList<>(); GetTaskId taskId = XLTaskHelper.get().parse(url, Path.thunder(Util.md5(url))); - if (!torrent && !taskId.getRealUrl().startsWith("magnet")) return List.of(Episode.create(taskId.getFileName(), taskId.getRealUrl())); + if (!torrent && !taskId.getRealUrl().startsWith("magnet")) return Arrays.asList(Episode.create(taskId.getFileName(), taskId.getRealUrl())); if (torrent) Download.create(url, taskId.getSaveFile()).start(); else while (XLTaskHelper.get().getTaskInfo(taskId).getTaskStatus() != 2 && time < 5000) sleep(); List medias = XLTaskHelper.get().getTorrentInfo(taskId.getSaveFile()).getMedias(); diff --git a/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java b/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java index f725cc95f..663edf94f 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java @@ -27,6 +27,7 @@ import com.fongmi.android.tv.utils.FileChooser; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import tv.danmaku.ijk.media.player.misc.ITrackInfo; @@ -148,7 +149,7 @@ public final class TrackDialog extends BaseDialog implements TrackAdapter.OnClic @Override public void onItemClick(Track item) { if (listener != null) listener.onTrackClick(item); - player.setTrack(List.of(item)); + player.setTrack(Arrays.asList(item)); if (item.isAdaptive()) return; dismiss(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java b/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java index 2401d3cc6..193a207cd 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java +++ b/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java @@ -6,6 +6,7 @@ import com.fongmi.android.tv.server.Server; import com.github.catvod.net.OkHttp; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -33,7 +34,7 @@ public class ScanTask { } public void start(String url) { - App.execute(() -> run(List.of(url))); + App.execute(() -> run(Arrays.asList(url))); } private void run(List items) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java index b8bbb567d..41c8ad425 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/ScanActivity.java @@ -19,6 +19,7 @@ import com.journeyapps.barcodescanner.BarcodeResult; import com.journeyapps.barcodescanner.CaptureManager; import com.journeyapps.barcodescanner.DefaultDecoderFactory; +import java.util.Arrays; import java.util.List; public class ScanActivity extends BaseActivity implements BarcodeCallback { @@ -44,7 +45,7 @@ public class ScanActivity extends BaseActivity implements BarcodeCallback { @Override protected void initView(Bundle savedInstanceState) { mCapture = new CaptureManager(this, mBinding.scanner); - mBinding.scanner.getBarcodeView().setDecoderFactory(new DefaultDecoderFactory(List.of(BarcodeFormat.QR_CODE))); + mBinding.scanner.getBarcodeView().setDecoderFactory(new DefaultDecoderFactory(Arrays.asList(BarcodeFormat.QR_CODE))); } @Override