From ee688ab69c6710fb7c601adfe451c01385144129 Mon Sep 17 00:00:00 2001
From: thanatos888 <109846350+thanatos888@users.noreply.github.com>
Date: Sun, 24 Jul 2022 19:28:29 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E7=89=87=E5=A4=B4?=
=?UTF-8?q?=E7=89=87=E5=B0=BE=E6=97=B6=E9=97=B4=E9=87=8D=E7=BD=AE=E6=8C=89?=
=?UTF-8?q?=E9=92=AE"?=
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 | 17 ---------
.../github/tvbox/osc/ui/dialog/ApiDialog.java | 1 -
.../res/layout/player_vod_control_view.xml | 14 +-------
app/src/main/res/values/strings.xml | 1 -
7 files changed, 2 insertions(+), 82 deletions(-)
delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
delete mode 100644 .idea/runConfigurations.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 6560a989..00000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 097a132f..fbe5affc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,10 +10,7 @@
-
-
-
-
+
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 3dae72a8..fe22096d 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,7 +37,6 @@ 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);
@@ -284,20 +283,6 @@ 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) {
@@ -305,7 +290,6 @@ 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);
@@ -323,7 +307,6 @@ 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 7dcd6d87..2a00358d 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,7 +55,6 @@ 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 fa42cec8..44da7f13 100644
--- a/app/src/main/res/layout/player_vod_control_view.xml
+++ b/app/src/main/res/layout/player_vod_control_view.xml
@@ -175,19 +175,7 @@
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 02ea1298..ec34bb7a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
-
TVBox
\ No newline at end of file