From 99f53e462da26d47d2d31e1de0011303905da684 Mon Sep 17 00:00:00 2001
From: thanatos518 <675530973@qq.com>
Date: Sun, 24 Jul 2022 13:27:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=87=E5=A4=B4?=
=?UTF-8?q?=E7=89=87=E5=B0=BE=E8=B7=B3=E8=BF=87=E6=97=B6=E9=97=B4=E9=87=8D?=
=?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/inspectionProfiles/Project_Default.xml | 36 +++++++++++++++++++
.idea/misc.xml | 5 ++-
.idea/runConfigurations.xml | 10 ++++++
.../osc/player/controller/VodController.java | 15 ++++++++
.../res/layout/player_vod_control_view.xml | 14 +++++++-
5 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 .idea/inspectionProfiles/Project_Default.xml
create mode 100644 .idea/runConfigurations.xml
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..77fc1c25 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) {
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" />
-
+
+
From 22323ff96fa9dbd9867a24c610b1bce6aeead81c Mon Sep 17 00:00:00 2001
From: thanatos518 <675530973@qq.com>
Date: Sun, 24 Jul 2022 13:48:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/github/tvbox/osc/player/controller/VodController.java | 2 ++
app/src/main/java/com/github/tvbox/osc/ui/dialog/ApiDialog.java | 1 +
app/src/main/res/values/strings.xml | 1 +
3 files changed, 4 insertions(+)
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 77fc1c25..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
@@ -305,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);
@@ -322,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/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