diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java index 3807d478..59af0219 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java @@ -169,7 +169,7 @@ public class PlayActivity extends BaseActivity { @Override public void playNext(boolean rmProgress) { String preProgressKey = progressKey; - PlayActivity.this.playNext(); + PlayActivity.this.playNext(rmProgress); if (rmProgress && preProgressKey != null) CacheManager.delete(MD5.string2MD5(preProgressKey), 0); } @@ -718,7 +718,7 @@ public class PlayActivity extends BaseActivity { private String sourceKey; private SourceBean sourceBean; - private void playNext() { + private void playNext(boolean isProgress) { boolean hasNext = true; if (mVodInfo == null || mVodInfo.seriesMap.get(mVodInfo.playFlag) == null) { hasNext = false; @@ -726,10 +726,15 @@ public class PlayActivity extends BaseActivity { hasNext = mVodInfo.playIndex + 1 < mVodInfo.seriesMap.get(mVodInfo.playFlag).size(); } if (!hasNext) { + if(mVodInfo!=null && isProgress){ + mVodInfo.playIndex=0; + Toast.makeText(this, "已经是最后一集了!,即将跳到第一集继续播放", Toast.LENGTH_SHORT).show(); + } Toast.makeText(this, "已经是最后一集了!", Toast.LENGTH_SHORT).show(); return; + }else { + mVodInfo.playIndex++; } - mVodInfo.playIndex++; play(false); } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java index d60a10fe..6140bc68 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java @@ -168,7 +168,7 @@ public class PlayFragment extends BaseLazyFragment { @Override public void playNext(boolean rmProgress) { String preProgressKey = progressKey; - PlayFragment.this.playNext(); + PlayFragment.this.playNext(rmProgress); if (rmProgress && preProgressKey != null) CacheManager.delete(MD5.string2MD5(preProgressKey), 0); } @@ -729,7 +729,7 @@ public class PlayFragment extends BaseLazyFragment { private String sourceKey; private SourceBean sourceBean; - private void playNext() { + private void playNext(boolean isProgress) { boolean hasNext = true; if (mVodInfo == null || mVodInfo.seriesMap.get(mVodInfo.playFlag) == null) { hasNext = false; @@ -737,10 +737,16 @@ public class PlayFragment extends BaseLazyFragment { hasNext = mVodInfo.playIndex + 1 < mVodInfo.seriesMap.get(mVodInfo.playFlag).size(); } if (!hasNext) { - Toast.makeText(requireContext(), "已经是最后一集了!", Toast.LENGTH_SHORT).show(); - return; + if(isProgress && mVodInfo!=null){ + mVodInfo.playIndex=0; + Toast.makeText(requireContext(), "已经是最后一集了!,即将跳到第一集继续播放", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(requireContext(), "已经是最后一集了!", Toast.LENGTH_SHORT).show(); + return; + } + }else { + mVodInfo.playIndex++; } - mVodInfo.playIndex++; play(false); }