From ba980757bb1a760c3d631d934ddf1ef2fb23752c Mon Sep 17 00:00:00 2001 From: 21561 <215613905@qq.com> Date: Wed, 27 Jul 2022 21:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=92=AD=E6=9C=AC=E9=9B=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=20=20=20=20=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=80=89=E9=9B=86=E5=85=A8=E5=B1=8F=E9=BB=98=E8=AE=A4=E6=96=B9?= =?UTF-8?q?=E6=A1=88=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E8=A1=A5=E5=85=85=E6=97=A5=E5=BF=97=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9Ajar=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=E5=A4=9Ajar=E9=A3=9F=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=9A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20{"key":"","name":"","type":?= =?UTF-8?q?3,"api":"","searchable":1,"quickSearch":1,"filterable":1,"jar":?= =?UTF-8?q?"your=5Fother=5Fjar"},?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/runConfigurations.xml | 10 ---------- .../tvbox/osc/player/controller/VodController.java | 8 ++++---- .../github/tvbox/osc/ui/activity/DetailActivity.java | 2 +- .../com/github/tvbox/osc/ui/activity/PlayActivity.java | 8 ++++---- .../com/github/tvbox/osc/ui/fragment/PlayFragment.java | 6 +++--- app/src/main/res/values/colors.xml | 2 +- 6 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea5..00000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java index 2e85c9dd..1042372b 100644 --- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java +++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java @@ -178,7 +178,7 @@ public class VodController extends BaseController { mPlayerRetry.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - listener.replay(); + listener.replay(true); hideBottom(); } }); @@ -252,7 +252,7 @@ public class VodController extends BaseController { mPlayerConfig.put("pl", playerType); updatePlayerCfgView(); listener.updatePlayerCfg(); - listener.replay(); + listener.replay(false); // hideBottom(); } catch (JSONException e) { e.printStackTrace(); @@ -278,7 +278,7 @@ public class VodController extends BaseController { mPlayerConfig.put("ijk", ijk); updatePlayerCfgView(); listener.updatePlayerCfg(); - listener.replay(); + listener.replay(false); hideBottom(); } catch (JSONException e) { e.printStackTrace(); @@ -406,7 +406,7 @@ public class VodController extends BaseController { void updatePlayerCfg(); - void replay(); + void replay(boolean replay); void errReplay(); } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java index b121420a..ce32e5a9 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java @@ -287,7 +287,7 @@ public class DetailActivity extends BaseActivity { seriesAdapter.notifyItemChanged(vodInfo.playIndex); jumpToPlay(); //选集全屏 此处取消注释 -// if (showPreview && !fullWindows) toggleFullPreview(); + if (showPreview && !fullWindows) toggleFullPreview(); } } }); 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 e42a8ae0..bfd38a5b 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 @@ -178,9 +178,9 @@ public class PlayActivity extends BaseActivity { } @Override - public void replay() { + public void replay(boolean replay) { autoRetryCount = 0; - play(true); + play(replay); } @Override @@ -466,7 +466,7 @@ public class PlayActivity extends BaseActivity { //存储播放进度 Object bodyKey=CacheManager.getCache(MD5.string2MD5(progressKey)); //重新播放清除现有进度 - if (reset) CacheManager.delete(MD5.string2MD5(progressKey), 0); + if (reset) {CacheManager.delete(MD5.string2MD5(progressKey), 0);} if (Thunder.play(vs.url, new Thunder.ThunderCallback() { @Override public void status(int code, String info) { @@ -491,7 +491,7 @@ public class PlayActivity extends BaseActivity { } sourceViewModel.getPlay(sourceKey, mVodInfo.playFlag, progressKey, vs.url); //执行重新播放后还原之前的进度 - if (reset) CacheManager.save(MD5.string2MD5(progressKey),bodyKey); +// 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 6cf83ef6..fe93fdf2 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 @@ -177,9 +177,9 @@ public class PlayFragment extends BaseLazyFragment { } @Override - public void replay() { + public void replay(boolean replay) { autoRetryCount = 0; - play(true); + play(replay); } @Override @@ -503,7 +503,7 @@ public class PlayFragment extends BaseLazyFragment { } sourceViewModel.getPlay(sourceKey, mVodInfo.playFlag, progressKey, vs.url); //执行重新播放后还原之前的进度 - if (reset) CacheManager.save(MD5.string2MD5(progressKey),bodyKey); +// if (reset) CacheManager.save(MD5.string2MD5(progressKey),bodyKey); } private String playSubtitle; diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d0d0ce1d..a5b0b899 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -27,6 +27,6 @@ #bbffffff #ffffffff #33ffffff - #1A000000 + #4D000000 #59353744 \ No newline at end of file