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 85db3b9d9..59babe9a5 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 isEmpty() { + return mState == State.EMPTY; + } + public void switchState(State state) { if (mState == state) return; mState = state; 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 f7b89ed78..14daecb7c 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 @@ -271,7 +271,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust mBinding.control.action.opening.setOnLongClickListener(view -> onOpeningReset()); mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event)); mBinding.control.action.getRoot().setOnTouchListener(this::onActionTouch); - mBinding.swipeLayout.setOnRefreshListener(this::getDetail); + mBinding.swipeLayout.setOnRefreshListener(this::onSwipeRefresh); mBinding.control.seek.setListener(mPlayers); } @@ -661,6 +661,11 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust return false; } + private void onSwipeRefresh() { + if (mBinding.progressLayout.isEmpty()) getDetail(); + else onRefresh(); + } + private void toggleFullscreen() { if (isFullscreen()) exitFullscreen(); else enterFullscreen();