diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..6560a989 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,36 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fbe5affc..097a132f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,7 +10,10 @@ - + + + + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..797acea5 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ 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 fe22096d..3dae72a8 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 @@ -37,6 +37,7 @@ import xyz.doikki.videoplayer.util.PlayerUtils; import static xyz.doikki.videoplayer.util.PlayerUtils.stringForTime; +//视频播放页面控件 public class VodController extends BaseController { public VodController(@NonNull @NotNull Context context) { super(context); @@ -283,6 +284,20 @@ public class VodController extends BaseController { } } }); +// 增加播放页面片头片尾时间重置 + findViewById(R.id.play_time_reset).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + try { + mPlayerConfig.put("et", 0); + mPlayerConfig.put("st", 0); + updatePlayerCfgView(); + listener.updatePlayerCfg(); + } catch (JSONException e) { + e.printStackTrace(); + } + } + }); mPlayerTimeStartBtn.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { @@ -290,6 +305,7 @@ public class VodController extends BaseController { int step = Hawk.get(HawkConfig.PLAY_TIME_STEP, 5); int st = mPlayerConfig.getInt("st"); st += step; + //片头最大跳过时间10分钟 if (st > 60 * 10) st = 0; mPlayerConfig.put("st", st); @@ -307,6 +323,7 @@ public class VodController extends BaseController { int step = Hawk.get(HawkConfig.PLAY_TIME_STEP, 5); int et = mPlayerConfig.getInt("et"); et += step; + //片尾最大跳过时间10分钟 if (et > 60 * 10) et = 0; mPlayerConfig.put("et", et); diff --git a/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java b/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java index 2a00358d..7dcd6d87 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java @@ -55,6 +55,7 @@ public class ApiDialog extends BaseDialog { ivQRCode = findViewById(R.id.ivQRCode); tvAddress = findViewById(R.id.tvAddress); inputApi = findViewById(R.id.input); + //内置网络接口在此处添加 inputApi.setText(Hawk.get(HawkConfig.API_URL, "")); findViewById(R.id.inputSubmit).setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/res/layout/player_vod_control_view.xml b/app/src/main/res/layout/player_vod_control_view.xml index ace2fc6e..a1420e58 100644 --- a/app/src/main/res/layout/player_vod_control_view.xml +++ b/app/src/main/res/layout/player_vod_control_view.xml @@ -175,7 +175,19 @@ android:text="1S" android:textColor="@android:color/white" android:textSize="@dimen/ts_24" /> - + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ec34bb7a..02ea1298 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ + TVBox \ No newline at end of file