重播本集功能完善 优化选集全屏默认方案 补充日志 支持多jar 多jar食用方式: {"key":"","name":"","type":3,"api":"","searchable":1,"quickSearch":1,"filterable":1,"jar":"your_other_jar"},

pull/3/head^2
21561 3 years ago
parent 7fd33e5d4a
commit ba980757bb
  1. 10
      .idea/runConfigurations.xml
  2. 8
      app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java
  3. 2
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  4. 8
      app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
  5. 6
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  6. 2
      app/src/main/res/values/colors.xml

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

@ -178,7 +178,7 @@ public class VodController extends BaseController {
mPlayerRetry.setOnClickListener(new OnClickListener() { mPlayerRetry.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
listener.replay(); listener.replay(true);
hideBottom(); hideBottom();
} }
}); });
@ -252,7 +252,7 @@ public class VodController extends BaseController {
mPlayerConfig.put("pl", playerType); mPlayerConfig.put("pl", playerType);
updatePlayerCfgView(); updatePlayerCfgView();
listener.updatePlayerCfg(); listener.updatePlayerCfg();
listener.replay(); listener.replay(false);
// hideBottom(); // hideBottom();
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
@ -278,7 +278,7 @@ public class VodController extends BaseController {
mPlayerConfig.put("ijk", ijk); mPlayerConfig.put("ijk", ijk);
updatePlayerCfgView(); updatePlayerCfgView();
listener.updatePlayerCfg(); listener.updatePlayerCfg();
listener.replay(); listener.replay(false);
hideBottom(); hideBottom();
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
@ -406,7 +406,7 @@ public class VodController extends BaseController {
void updatePlayerCfg(); void updatePlayerCfg();
void replay(); void replay(boolean replay);
void errReplay(); void errReplay();
} }

@ -287,7 +287,7 @@ public class DetailActivity extends BaseActivity {
seriesAdapter.notifyItemChanged(vodInfo.playIndex); seriesAdapter.notifyItemChanged(vodInfo.playIndex);
jumpToPlay(); jumpToPlay();
//选集全屏 此处取消注释 //选集全屏 此处取消注释
// if (showPreview && !fullWindows) toggleFullPreview(); if (showPreview && !fullWindows) toggleFullPreview();
} }
} }
}); });

@ -178,9 +178,9 @@ public class PlayActivity extends BaseActivity {
} }
@Override @Override
public void replay() { public void replay(boolean replay) {
autoRetryCount = 0; autoRetryCount = 0;
play(true); play(replay);
} }
@Override @Override
@ -466,7 +466,7 @@ public class PlayActivity extends BaseActivity {
//存储播放进度 //存储播放进度
Object bodyKey=CacheManager.getCache(MD5.string2MD5(progressKey)); 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() { if (Thunder.play(vs.url, new Thunder.ThunderCallback() {
@Override @Override
public void status(int code, String info) { public void status(int code, String info) {
@ -491,7 +491,7 @@ public class PlayActivity extends BaseActivity {
} }
sourceViewModel.getPlay(sourceKey, mVodInfo.playFlag, progressKey, vs.url); 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; private String playSubtitle;

@ -177,9 +177,9 @@ public class PlayFragment extends BaseLazyFragment {
} }
@Override @Override
public void replay() { public void replay(boolean replay) {
autoRetryCount = 0; autoRetryCount = 0;
play(true); play(replay);
} }
@Override @Override
@ -503,7 +503,7 @@ public class PlayFragment extends BaseLazyFragment {
} }
sourceViewModel.getPlay(sourceKey, mVodInfo.playFlag, progressKey, vs.url); 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; private String playSubtitle;

@ -27,6 +27,6 @@
<color name="color_BBFFFFFF">#bbffffff</color> <color name="color_BBFFFFFF">#bbffffff</color>
<color name="color_FFFFFF">#ffffffff</color> <color name="color_FFFFFF">#ffffffff</color>
<color name="color_33FFFFFF">#33ffffff</color> <color name="color_33FFFFFF">#33ffffff</color>
<color name="color_99FFFFFF">#1A000000</color> <color name="color_99FFFFFF">#4D000000</color>
<color name="color_59353744">#59353744</color> <color name="color_59353744">#59353744</color>
</resources> </resources>
Loading…
Cancel
Save