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 3fe33f8f..e42a8ae0 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 @@ -463,6 +463,9 @@ public class PlayActivity extends BaseActivity { playUrl(null, null); String progressKey = mVodInfo.sourceKey + mVodInfo.id + mVodInfo.playFlag + mVodInfo.playIndex; + //存储播放进度 + Object bodyKey=CacheManager.getCache(MD5.string2MD5(progressKey)); + //重新播放清除现有进度 if (reset) CacheManager.delete(MD5.string2MD5(progressKey), 0); if (Thunder.play(vs.url, new Thunder.ThunderCallback() { @Override @@ -487,6 +490,8 @@ public class PlayActivity extends BaseActivity { return; } sourceViewModel.getPlay(sourceKey, mVodInfo.playFlag, progressKey, vs.url); + //执行重新播放后还原之前的进度 + if (reset) CacheManager.save(MD5.string2MD5(progressKey),bodyKey); } private String playSubtitle; 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 7f6a44b0..6cf83ef6 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 @@ -475,6 +475,9 @@ public class PlayFragment extends BaseLazyFragment { playUrl(null, null); String progressKey = mVodInfo.sourceKey + mVodInfo.id + mVodInfo.playFlag + mVodInfo.playIndex; + //存储播放进度 + Object bodyKey=CacheManager.getCache(MD5.string2MD5(progressKey)); + //重新播放清除现有进度 if (reset) CacheManager.delete(MD5.string2MD5(progressKey), 0); if (Thunder.play(vs.url, new Thunder.ThunderCallback() { @Override @@ -499,6 +502,8 @@ public class PlayFragment extends BaseLazyFragment { return; } sourceViewModel.getPlay(sourceKey, mVodInfo.playFlag, progressKey, vs.url); + //执行重新播放后还原之前的进度 + if (reset) CacheManager.save(MD5.string2MD5(progressKey),bodyKey); } private String playSubtitle; @@ -539,7 +544,13 @@ public class PlayFragment extends BaseLazyFragment { JSONObject jsonParse(String input, String json) throws JSONException { JSONObject jsonPlayData = new JSONObject(json); - String url = jsonPlayData.getString("url"); + //小窗版解析方法改到这了 之前那个位置data解析无效 + String url; + if (jsonPlayData.has("data")) { + url = jsonPlayData.getJSONObject("data").getString("url"); + } else { + url = jsonPlayData.getString("url"); + } String msg = jsonPlayData.optString("msg", ""); if (url.startsWith("//")) { url = "https:" + url;