Fix preview bug

pull/137/head
FongMi 2 years ago
parent 1ff04c070a
commit 9cd4a8195b
  1. 14
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  2. 2
      app/src/leanback/res/layout/view_widget_vod.xml
  3. 14
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  4. 2
      app/src/mobile/res/layout/view_widget_vod.xml

@ -471,14 +471,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
} }
private void seamless(Vod.Flag flag, boolean force) { private void seamless(Vod.Flag flag, boolean force) {
if (Setting.getFlag() == 1 && mHistory.isNew()) { if (Setting.getFlag() == 1 && (mHistory.isNew() || !force)) return;
hideProgress();
} else if (Setting.getFlag() == 0 || force) {
Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null); Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
if (episode == null || episode.isActivated()) return; if (episode == null || episode.isActivated()) return;
mHistory.setVodRemarks(episode.getName()); mHistory.setVodRemarks(episode.getName());
setEpisodeActivated(episode); setEpisodeActivated(episode);
} hidePreview();
} }
private void setEpisodeActivated(Vod.Flag.Episode item) { private void setEpisodeActivated(Vod.Flag.Episode item) {
@ -779,14 +777,14 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
hideInfo(); hideInfo();
} }
private void showPreview(Drawable resource) { private void showPreview(Drawable preview) {
if (Setting.getFlag() == 0 || isVisible(mBinding.widget.progress)) return; if (Setting.getFlag() == 0 || isGone(mBinding.widget.preview)) return;
mBinding.widget.preview.setVisibility(View.VISIBLE); mBinding.widget.preview.setVisibility(View.VISIBLE);
mBinding.widget.preview.setImageDrawable(resource); mBinding.widget.preview.setImageDrawable(preview);
} }
private void hidePreview() { private void hidePreview() {
mBinding.widget.preview.setVisibility(View.VISIBLE); mBinding.widget.preview.setVisibility(View.GONE);
mBinding.widget.preview.setImageDrawable(null); mBinding.widget.preview.setImageDrawable(null);
} }

@ -233,6 +233,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" /> android:visibility="invisible" />
</FrameLayout> </FrameLayout>

@ -501,14 +501,12 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
} }
private void seamless(Vod.Flag flag, boolean force) { private void seamless(Vod.Flag flag, boolean force) {
if (Setting.getFlag() == 1 && mHistory.isNew()) { if (Setting.getFlag() == 1 && (mHistory.isNew() || !force)) return;
hideProgress();
} else if (Setting.getFlag() == 0 || force) {
Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null); Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
if (episode == null || episode.isActivated()) return; if (episode == null || episode.isActivated()) return;
mHistory.setVodRemarks(episode.getName()); mHistory.setVodRemarks(episode.getName());
onItemClick(episode); onItemClick(episode);
} hidePreview();
} }
private void reverseEpisode(boolean scroll) { private void reverseEpisode(boolean scroll) {
@ -826,14 +824,14 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
mDialogs.clear(); mDialogs.clear();
} }
private void showPreview(Drawable resource) { private void showPreview(Drawable preview) {
if (Setting.getFlag() == 0 || isVisible(mBinding.widget.progress)) return; if (Setting.getFlag() == 0 || isGone(mBinding.widget.preview)) return;
mBinding.widget.preview.setVisibility(View.VISIBLE); mBinding.widget.preview.setVisibility(View.VISIBLE);
mBinding.widget.preview.setImageDrawable(resource); mBinding.widget.preview.setImageDrawable(preview);
} }
private void hidePreview() { private void hidePreview() {
mBinding.widget.preview.setVisibility(View.VISIBLE); mBinding.widget.preview.setVisibility(View.GONE);
mBinding.widget.preview.setImageDrawable(null); mBinding.widget.preview.setImageDrawable(null);
} }

@ -155,6 +155,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" /> android:visibility="invisible" />
</FrameLayout> </FrameLayout>
Loading…
Cancel
Save