From 07bc3d9842c2feceedcc60d297fd35a12379dae2 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 5 Aug 2022 10:41:22 +0800
Subject: [PATCH] Clean code

---
 .../android/tv/ui/activity/DetailActivity.java  | 17 ++++-------------
 .../java/com/fongmi/android/tv/bean/Vod.java    |  9 +++------
 2 files changed, 7 insertions(+), 19 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 fdbc269a1..54293e3f2 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
@@ -162,11 +162,7 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener {
     }
 
     private void getPlayer() {
-        getPlayer(getEpisodePosition());
-    }
-
-    private void getPlayer(int position) {
-        Vod.Flag.Episode item = (Vod.Flag.Episode) mEpisodeAdapter.get(position);
+        Vod.Flag.Episode item = (Vod.Flag.Episode) mEpisodeAdapter.get(getEpisodePosition());
         if (mFullscreen) Notify.show(ResUtil.getString(R.string.play_ready, item.getName()));
         mSiteViewModel.playerContent(getKey(), getVodFlag().getFlag(), item.getUrl());
         mBinding.progress.getRoot().setVisibility(View.VISIBLE);
@@ -219,15 +215,10 @@ public class DetailActivity extends BaseActivity implements KeyDown.Listener {
 
     private void setEpisodeActivated(Vod.Flag.Episode item) {
         mCurrent = mBinding.flag.getSelectedPosition();
-        for (int i = 0; i < mFlagAdapter.size(); i++) {
-            Vod.Flag flag = (Vod.Flag) mFlagAdapter.get(i);
-            if (mCurrent == i) flag.setActivated(item);
-            else flag.deactivated();
-        }
+        for (int i = 0; i < mFlagAdapter.size(); i++) ((Vod.Flag) mFlagAdapter.get(i)).toggle(mCurrent == i, item);
         mEpisodeAdapter.notifyArrayItemRangeChanged(0, mEpisodeAdapter.size());
-        int position = getEpisodePosition();
-        mHandler.post(() -> mBinding.episode.setSelectedPosition(position));
-        getPlayer(position);
+        mHandler.post(() -> mBinding.episode.setSelectedPosition(getEpisodePosition()));
+        getPlayer();
     }
 
     private void setGroup(int size) {
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 1c7937e10..1e149c472 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
@@ -200,12 +200,9 @@ public class Vod {
             this.activated = activated;
         }
 
-        public void deactivated() {
-            for (Episode item : getEpisodes()) item.deactivated();
-        }
-
-        public void setActivated(Episode episode) {
-            for (Episode item : getEpisodes()) item.setActivated(episode);
+        public void toggle(boolean activated, Episode episode) {
+            if (activated) for (Episode item : getEpisodes()) item.setActivated(episode);
+            else for (Episode item : getEpisodes()) item.deactivated();
         }
 
         @Override