From 43828221125b1b004eacb63dfd0e5ac79f382c56 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 14 Feb 2023 00:07:58 +0800
Subject: [PATCH] [mobile] clean code

---
 .../tv/ui/activity/DetailActivity.java        | 23 +++++++++++--------
 .../android/tv/ui/adapter/EpisodeAdapter.java |  3 +--
 .../android/tv/ui/adapter/FlagAdapter.java    |  3 +--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index 32c845a5f..742b6cf89 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -276,11 +276,10 @@ public class DetailActivity extends BaseActivity implements FlagAdapter.OnClickL
         getDetail();
     }
 
-    private void getPlayer(Vod.Flag.Episode item, boolean replay) {
-        mBinding.widget.title.setText(getString(R.string.detail_title, mBinding.name.getText(), item.getName()));
-        mViewModel.playerContent(getKey(), mFlagAdapter.getActivated().getFlag(), item.getUrl());
-        Clock.get().setCallback(null);
-        updateHistory(item, replay);
+    private void getPlayer(Vod.Flag flag, Vod.Flag.Episode episode, boolean replay) {
+        mBinding.widget.title.setText(getString(R.string.detail_title, mBinding.name.getText(), episode.getName()));
+        mViewModel.playerContent(getKey(), flag.getFlag(), episode.getUrl());
+        updateHistory(episode, replay);
         showProgress();
     }
 
@@ -360,13 +359,17 @@ public class DetailActivity extends BaseActivity implements FlagAdapter.OnClickL
     }
 
     private void onRefresh() {
-        Vod.Flag.Episode episode = getEpisode();
-        if (episode != null) getPlayer(episode, false);
+        Clock.get().setCallback(null);
+        if (mFlagAdapter.getItemCount() == 0) return;
+        if (mEpisodeAdapter.getItemCount() == 0) return;
+        getPlayer(getFlag(), getEpisode(), false);
     }
 
     private void onReset() {
-        Vod.Flag.Episode episode = getEpisode();
-        if (episode != null) getPlayer(episode, isReplay());
+        Clock.get().setCallback(null);
+        if (mFlagAdapter.getItemCount() == 0) return;
+        if (mEpisodeAdapter.getItemCount() == 0) return;
+        getPlayer(getFlag(), getEpisode(), isReplay());
     }
 
     private void enterFullscreen() {
@@ -479,7 +482,7 @@ public class DetailActivity extends BaseActivity implements FlagAdapter.OnClickL
         mHistory.setPosition(position);
         mHistory.setEpisodeUrl(item.getUrl());
         mHistory.setVodRemarks(item.getName());
-        mHistory.setVodFlag(mFlagAdapter.getActivated().getFlag());
+        mHistory.setVodFlag(getFlag().getFlag());
         mHistory.setCreateTime(System.currentTimeMillis());
     }
 
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 9f536a68e..8413cc599 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
@@ -44,8 +44,7 @@ public class EpisodeAdapter extends RecyclerView.Adapter<EpisodeAdapter.ViewHold
     }
 
     public Vod.Flag.Episode getActivated() {
-        for (Vod.Flag.Episode item : mItems) if (item.isActivated()) return item;
-        return null;
+        return mItems.get(getPosition());
     }
 
     public int getPosition() {
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 22c2bf038..e6e0dba8c 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
@@ -45,8 +45,7 @@ public class FlagAdapter extends RecyclerView.Adapter<FlagAdapter.ViewHolder> {
     }
 
     public Vod.Flag getActivated() {
-        for (Vod.Flag item : mItems) if (item.isActivated()) return item;
-        return null;
+        return mItems.get(getPosition());
     }
 
     public int getPosition() {