From 4916b69e1ef1a7f3e8ea2714fb5334789a20e871 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 2 Jun 2023 16:51:19 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E6=92=AD=E6=94=BE=E6=9C=AC=E5=9C=B0?=
=?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E5=99=A8=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../player/ProVideoActivity.java | 1 +
.../player/VideoControllerView.java | 19 ++++++++++++-------
.../watcher/ui/HistoryVideoActivity.kt | 11 ++++++++++-
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java b/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java
index 9118d57..068ee10 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java
+++ b/app/src/main/java/com/yinuo/safetywatcher/player/ProVideoActivity.java
@@ -189,6 +189,7 @@ public class ProVideoActivity extends AppCompatActivity {
mVideoView.setOnCompletionListener(iMediaPlayer -> {
Log.i(TAG, "播放完成");
+ mVideoView.seekTo(0);
mProgress.setVisibility(View.GONE);
});
diff --git a/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java b/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java
index 39ac619..e89011f 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java
+++ b/app/src/main/java/com/yinuo/safetywatcher/player/VideoControllerView.java
@@ -127,10 +127,12 @@ public class VideoControllerView extends FrameLayout implements IMediaController
if (pos < 0) {
pos = 0;
}
+ mPlayer.pause();
mPlayer.seekTo(pos);
- setProgress();
-
show(sDefaultTimeout);
+ if (!mPlayer.isPlaying()) {
+ mPlayer.start();
+ }
}
};
@@ -143,10 +145,15 @@ public class VideoControllerView extends FrameLayout implements IMediaController
int pos = mPlayer.getCurrentPosition();
pos += 15000; // милисекунд
+ if (pos > mPlayer.getDuration()) {
+ pos = mPlayer.getDuration();
+ }
+ mPlayer.pause();
mPlayer.seekTo(pos);
- setProgress();
-
show(sDefaultTimeout);
+ if (!mPlayer.isPlaying()) {
+ mPlayer.start();
+ }
}
};
@@ -544,9 +551,7 @@ public class VideoControllerView extends FrameLayout implements IMediaController
mProgress.setMax(duration);
mProgress.setProgress(position);
} else {
- if (position > mProgress.getProgress()) {
- mProgress.setProgress(position);
- }
+ mProgress.setProgress(position);
}
} else {
mProgress.setMax(0);
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt
index bef168b..3c20849 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt
@@ -1,6 +1,7 @@
package com.yinuo.safetywatcher.watcher.ui
import android.content.Intent
+import android.net.Uri
import android.view.View
import com.yinuo.safetywatcher.R
import com.yinuo.safetywatcher.databinding.ActivityHistoryVideoBinding
@@ -8,6 +9,8 @@ import com.yinuo.safetywatcher.player.ProVideoActivity
import com.yinuo.safetywatcher.watcher.base.BaseActivity
import com.yinuo.safetywatcher.watcher.view.CommonTopBar
import com.yinuo.safetywatcher.xls.utils.PathUtils
+import java.io.File
+
class HistoryVideoActivity : BaseActivity() {
@@ -17,7 +20,13 @@ class HistoryVideoActivity : BaseActivity() {
override fun onOptionClick(type: Int, target: View) {
if (0 == type) {
-
+// val intent = Intent(Intent.ACTION_VIEW)
+// val path = PathUtils.getExternalStorageDirectory() + "/test2.mp4" //该路径可以自定义
+// val file = File(path)
+// val uri = Uri.fromFile(file)
+// intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+// intent.setDataAndType(uri, "video/*")
+// startActivity(intent)
} else if (1 == type) {
val intent = Intent(this@HistoryVideoActivity, ProVideoActivity::class.java)
val path = PathUtils.getExternalStorageDirectory() + "/test.mp4"