From 9cd4a8195bf0178a4dd46e4775b27308b86c55f3 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 3 Aug 2023 12:57:04 +0800
Subject: [PATCH] Fix preview bug

---
 .../tv/ui/activity/DetailActivity.java        | 22 +++++++++----------
 .../leanback/res/layout/view_widget_vod.xml   |  2 +-
 .../tv/ui/activity/DetailActivity.java        | 22 +++++++++----------
 app/src/mobile/res/layout/view_widget_vod.xml |  2 +-
 4 files changed, 22 insertions(+), 26 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 220faa676..c9a87a961 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
@@ -471,14 +471,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     }
 
     private void seamless(Vod.Flag flag, boolean force) {
-        if (Setting.getFlag() == 1 && mHistory.isNew()) {
-            hideProgress();
-        } else if (Setting.getFlag() == 0 || force) {
-            Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
-            if (episode == null || episode.isActivated()) return;
-            mHistory.setVodRemarks(episode.getName());
-            setEpisodeActivated(episode);
-        }
+        if (Setting.getFlag() == 1 && (mHistory.isNew() || !force)) return;
+        Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
+        if (episode == null || episode.isActivated()) return;
+        mHistory.setVodRemarks(episode.getName());
+        setEpisodeActivated(episode);
+        hidePreview();
     }
 
     private void setEpisodeActivated(Vod.Flag.Episode item) {
@@ -779,14 +777,14 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         hideInfo();
     }
 
-    private void showPreview(Drawable resource) {
-        if (Setting.getFlag() == 0 || isVisible(mBinding.widget.progress)) return;
+    private void showPreview(Drawable preview) {
+        if (Setting.getFlag() == 0 || isGone(mBinding.widget.preview)) return;
         mBinding.widget.preview.setVisibility(View.VISIBLE);
-        mBinding.widget.preview.setImageDrawable(resource);
+        mBinding.widget.preview.setImageDrawable(preview);
     }
 
     private void hidePreview() {
-        mBinding.widget.preview.setVisibility(View.VISIBLE);
+        mBinding.widget.preview.setVisibility(View.GONE);
         mBinding.widget.preview.setImageDrawable(null);
     }
 
diff --git a/app/src/leanback/res/layout/view_widget_vod.xml b/app/src/leanback/res/layout/view_widget_vod.xml
index b6ba9b8e0..c5656de7a 100644
--- a/app/src/leanback/res/layout/view_widget_vod.xml
+++ b/app/src/leanback/res/layout/view_widget_vod.xml
@@ -233,6 +233,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
-        android:visibility="gone" />
+        android:visibility="invisible" />
 
 </FrameLayout>
\ No newline at end of file
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 671929c35..ce2eaa8bb 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
@@ -501,14 +501,12 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     }
 
     private void seamless(Vod.Flag flag, boolean force) {
-        if (Setting.getFlag() == 1 && mHistory.isNew()) {
-            hideProgress();
-        } else if (Setting.getFlag() == 0 || force) {
-            Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
-            if (episode == null || episode.isActivated()) return;
-            mHistory.setVodRemarks(episode.getName());
-            onItemClick(episode);
-        }
+        if (Setting.getFlag() == 1 && (mHistory.isNew() || !force)) return;
+        Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
+        if (episode == null || episode.isActivated()) return;
+        mHistory.setVodRemarks(episode.getName());
+        onItemClick(episode);
+        hidePreview();
     }
 
     private void reverseEpisode(boolean scroll) {
@@ -826,14 +824,14 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
         mDialogs.clear();
     }
 
-    private void showPreview(Drawable resource) {
-        if (Setting.getFlag() == 0 || isVisible(mBinding.widget.progress)) return;
+    private void showPreview(Drawable preview) {
+        if (Setting.getFlag() == 0 || isGone(mBinding.widget.preview)) return;
         mBinding.widget.preview.setVisibility(View.VISIBLE);
-        mBinding.widget.preview.setImageDrawable(resource);
+        mBinding.widget.preview.setImageDrawable(preview);
     }
 
     private void hidePreview() {
-        mBinding.widget.preview.setVisibility(View.VISIBLE);
+        mBinding.widget.preview.setVisibility(View.GONE);
         mBinding.widget.preview.setImageDrawable(null);
     }
 
diff --git a/app/src/mobile/res/layout/view_widget_vod.xml b/app/src/mobile/res/layout/view_widget_vod.xml
index 0d2f972fb..331645b40 100644
--- a/app/src/mobile/res/layout/view_widget_vod.xml
+++ b/app/src/mobile/res/layout/view_widget_vod.xml
@@ -155,6 +155,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
-        android:visibility="gone" />
+        android:visibility="invisible" />
 
 </FrameLayout>
\ No newline at end of file