跳过头尾时间添加'加减秒调整',ref tk

XiaoRanLiu3119 · Dec 14, 2023 · d87fcd2 · d87fcd2
1 parent 39f4a28
commit d87fcd2
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 4 deletions.
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
@@ -1059,4 +1059,35 @@ public void hideSubtitle() {
         hideBottom();
         Toast.makeText(getContext(), "字幕已关闭", Toast.LENGTH_SHORT).show();
     }
+
+
+    public void increaseTime(String type) {
+        try {
+            int step = Hawk.get(HawkConfig.PLAY_TIME_STEP, 1);
+            int time = mPlayerConfig.getInt(type);
+            time += step;
+            if (time > 30 * 10)
+                time = 0;
+            mPlayerConfig.put(type, time);
+            updatePlayerCfgView();
+            listener.updatePlayerCfg();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void decreaseTime(String type) {
+        try {
+            int step = Hawk.get(HawkConfig.PLAY_TIME_STEP, 1);
+            int time = mPlayerConfig.getInt(type);
+            time -= step;
+            if (time < 0)
+                time = (30 * 10);
+            mPlayerConfig.put(type, time);
+            updatePlayerCfgView();
+            listener.updatePlayerCfg();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/dialog/PlayingControlDialog.java b/app/src/main/java/com/github/tvbox/osc/ui/dialog/PlayingControlDialog.java
@@ -68,6 +68,22 @@ private void initListener(){
         mBinding.scale.setOnClickListener(view -> changeAndUpdateText(mBinding.scale,mController.mPlayerScaleBtn));
         mBinding.playTimeStart.setOnClickListener(view -> changeAndUpdateText(mBinding.playTimeStart,mController.mPlayerTimeStartBtn));
         mBinding.playTimeEnd.setOnClickListener(view -> changeAndUpdateText(mBinding.playTimeEnd,mController.mPlayerTimeSkipBtn));
+        mBinding.increaseStart.setOnClickListener(view -> {
+            mController.increaseTime("st");
+            updateSkipText(true);
+        });
+        mBinding.decreaseStart.setOnClickListener(view -> {
+            mController.decreaseTime("st");
+            updateSkipText(true);
+        });
+        mBinding.increaseEnd.setOnClickListener(view -> {
+            mController.increaseTime("et");
+            updateSkipText(false);
+        });
+        mBinding.decreaseEnd.setOnClickListener(view -> {
+            mController.decreaseTime("et");
+            updateSkipText(false);
+        });
         mBinding.player.setOnClickListener(view -> changeAndUpdateText(mBinding.player,mController.mPlayerBtn));
         mBinding.decode.setOnClickListener(view -> changeAndUpdateText(mBinding.decode,mController.mPlayerIJKBtn));
 
@@ -84,6 +100,13 @@ private void initListener(){
         });
     }
 
+    private void updateSkipText(boolean start){
+        if (start){
+            mBinding.playTimeStart.setText(mController.mPlayerTimeStartBtn.getText());
+        }else {
+            mBinding.playTimeEnd.setText(mController.mPlayerTimeSkipBtn.getText());
+        }
+    }
     /**
      * 点击直接调用controller里面声明好的点击事件,(不改动原逻辑,隐藏controller里的设置view,全由弹窗设置)
      * @param view 不为空变更配置文字,如更换播放器/缩放, 为空只操作点击之间,不需改变文字,如刷新/重播

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/dialog/PlayingControlRightDialog.java b/app/src/main/java/com/github/tvbox/osc/ui/dialog/PlayingControlRightDialog.java
@@ -72,6 +72,22 @@ private void initListener(){
         mBinding.scale.setOnClickListener(view -> changeAndUpdateText(mBinding.scale,mController.mPlayerScaleBtn));
         mBinding.playTimeStart.setOnClickListener(view -> changeAndUpdateText(mBinding.playTimeStart,mController.mPlayerTimeStartBtn));
         mBinding.playTimeEnd.setOnClickListener(view -> changeAndUpdateText(mBinding.playTimeEnd,mController.mPlayerTimeSkipBtn));
+        mBinding.increaseStart.setOnClickListener(view -> {
+            mController.increaseTime("st");
+            updateSkipText(true);
+        });
+        mBinding.decreaseStart.setOnClickListener(view -> {
+            mController.decreaseTime("st");
+            updateSkipText(true);
+        });
+        mBinding.increaseEnd.setOnClickListener(view -> {
+            mController.increaseTime("et");
+            updateSkipText(false);
+        });
+        mBinding.decreaseEnd.setOnClickListener(view -> {
+            mController.decreaseTime("et");
+            updateSkipText(false);
+        });
         mBinding.player.setOnClickListener(view -> changeAndUpdateText(mBinding.player,mController.mPlayerBtn));
         mBinding.decode.setOnClickListener(view -> changeAndUpdateText(mBinding.decode,mController.mPlayerIJKBtn));
 
@@ -89,6 +105,14 @@ private void initListener(){
         });
     }
 
+    private void updateSkipText(boolean start){
+        if (start){
+            mBinding.playTimeStart.setText(mController.mPlayerTimeStartBtn.getText());
+        }else {
+            mBinding.playTimeEnd.setText(mController.mPlayerTimeSkipBtn.getText());
+        }
+    }
+
     /**
      * 点击直接调用controller里面声明好的点击事件,(不改动原逻辑,隐藏controller里的设置view,全由弹窗设置)
      * @param view 不为空变更配置文字,如更换播放器/缩放, 为空只操作点击之间,不需改变文字,如刷新/重播

diff --git a/app/src/main/res/layout/dialog_playing_control.xml b/app/src/main/res/layout/dialog_playing_control.xml
@@ -156,33 +156,63 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
+                android:orientation="horizontal"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/decrease_start"
+                    android:layout_width="26dp"
+                    android:layout_height="26dp"
+                    android:src="@drawable/icon_back"
+                    app:tint="@color/text_gray"
+                    />
                 <TextView
                     android:id="@+id/play_time_start"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:background="@drawable/bg_r_common_stroke_primary"
                     android:gravity="center"
                     android:singleLine="true"
                     android:textColor="@color/text_gray"
                     android:paddingVertical="4dp"
                     android:paddingHorizontal="10dp"
                     tools:text="片头" />
+                <ImageView
+                    android:id="@+id/increase_start"
+                    android:layout_width="26dp"
+                    android:layout_height="26dp"
+                    android:src="@drawable/icon_pre"
+                    app:tint="@color/text_gray"
+                    />
 
+                <ImageView
+                    android:id="@+id/decrease_end"
+                    android:layout_width="26dp"
+                    android:layout_height="26dp"
+                    android:src="@drawable/icon_back"
+                    app:tint="@color/text_gray"
+                    android:layout_marginStart="10dp"
+                    />
                 <TextView
                     android:id="@+id/play_time_end"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:background="@drawable/bg_r_common_stroke_primary"
                     android:gravity="center"
                     android:singleLine="true"
                     android:textColor="@color/text_gray"
                     android:paddingVertical="4dp"
                     android:paddingHorizontal="10dp"
                     tools:text="片尾" />
+                <ImageView
+                    android:id="@+id/increase_end"
+                    android:layout_width="26dp"
+                    android:layout_height="26dp"
+                    android:src="@drawable/icon_pre"
+                    app:tint="@color/text_gray"
+                    />
 
                 <TextView
                     android:id="@+id/start_end_reset"
@@ -195,6 +225,7 @@
                     android:textColor="@color/text_gray"
                     android:paddingVertical="4dp"
                     android:paddingHorizontal="10dp"
+                    android:layout_marginStart="10dp"
                     android:text="重置" />
             </LinearLayout>