From 90ae44269b815d254f23f595da24fffadb4aadcd Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 10 Aug 2023 10:51:58 +0800 Subject: [PATCH] Fix bug --- app/src/main/java/com/fongmi/android/tv/bean/Vod.java | 2 +- .../com/fongmi/android/tv/player/extractor/Magnet.java | 3 ++- app/src/mobile/java/com/fongmi/android/tv/Product.java | 4 ++++ .../com/fongmi/android/tv/ui/adapter/EpisodeAdapter.java | 8 +++++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java index 0e3aa92b2..adfea1e18 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java @@ -456,7 +456,7 @@ public class Vod { public static class Sorter implements Comparator { public static List sort(List items) { - Collections.sort(items, new Sorter()); + if (items.size() > 1) Collections.sort(items, new Sorter()); return items; } diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/Magnet.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/Magnet.java index 6b5162e0a..f5f26dc1c 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/Magnet.java +++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/Magnet.java @@ -51,7 +51,8 @@ public class Magnet implements Callable> { public static void addAll(List items, Future> future) { try { items.addAll(Vod.Flag.Episode.Sorter.sort(future.get())); - } catch (Exception ignored) { + } catch (Exception e) { + e.printStackTrace(); } } } diff --git a/app/src/mobile/java/com/fongmi/android/tv/Product.java b/app/src/mobile/java/com/fongmi/android/tv/Product.java index cbe207918..cfae91205 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Product.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Product.java @@ -40,4 +40,8 @@ public class Product { int height = (int) (width / style.getRatio()); return new int[]{width, height}; } + + public static int getEms() { + return Math.min(ResUtil.getScreenWidth() / ResUtil.sp2px(18), 35); + } } 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 216bc27ce..86c7fe33c 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 @@ -7,6 +7,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.fongmi.android.tv.Product; import com.fongmi.android.tv.bean.Vod; import com.fongmi.android.tv.databinding.AdapterEpisodeGridBinding; import com.fongmi.android.tv.databinding.AdapterEpisodeListBinding; @@ -84,8 +85,8 @@ public class EpisodeAdapter extends RecyclerView.Adapter mListener.onItemClick(item)); } }