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 af8bf67e7..514d3ddd0 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 @@ -6,6 +6,7 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.text.Html; +import android.text.TextUtils; import android.util.TypedValue; import android.view.KeyEvent; import android.view.View; @@ -237,8 +238,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis setRecyclerView(); setVideoView(); setViewModel(); - getDetail(); checkCast(); + checkId(); } @Override @@ -353,16 +354,21 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis else mBinding.progressLayout.showProgress(); } + private void checkId() { + if (TextUtils.isEmpty(getId())) setEmpty(); + else getDetail(); + } + private void getDetail() { mViewModel.detailContent(getKey(), getId()); } private void getDetail(Vod item) { + if (mBinding.progressLayout.isContent()) Notify.progress(this); getIntent().putExtra("key", item.getSiteKey()); getIntent().putExtra("id", item.getVodId()); mBinding.scroll.scrollTo(0, 0); Clock.get().setCallback(null); - Notify.progress(this); mPlayers.stop(); hideProgress(); getDetail(); diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/ProgressLayout.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/ProgressLayout.java index 59babe9a5..7b1a0aeaf 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/ProgressLayout.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/ProgressLayout.java @@ -88,6 +88,10 @@ public class ProgressLayout extends RelativeLayout { return mState == State.PROGRESS; } + public boolean isContent() { + return mState == State.CONTENT; + } + public boolean isEmpty() { return mState == State.EMPTY; }