From 0240ef41cc2a8cc30cb40f877a1ae02255259337 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期四, 29 一月 2026 13:31:37 +0800
Subject: [PATCH] 1.修改水印 usb
---
app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java
index baabf8a..7ccabbd 100644
--- a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java
+++ b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraRecordManager.java
@@ -149,7 +149,11 @@
private ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
private ScheduledFuture<?> watermarkFuture;
private void setWaterMask() {
-
+ if (mediaArgu.getUsbCameraId()==2){
+ GlobalData.getInstance().getCameraTag="_P2";
+ }else{
+ GlobalData.getInstance().getCameraTag="_P1";
+ }
// 闃叉閲嶅 schedule锛坰tartRecord 鍙兘琚娆¤皟鐢級
if (watermarkFuture != null && !watermarkFuture.isCancelled()) {
return;
@@ -369,7 +373,7 @@
}
// 鍒涘缓鏂扮殑瑙嗛鏂囦欢
- currentVideoFile = VideoFileUtils.getVideoFile(context, mediaArgu.getTfCardFlag());
+ currentVideoFile = VideoFileUtils.getVideoFile(context, mediaArgu.getTfCardFlag(),mediaArgu.getUsbCameraId());
if (currentVideoFile == null) {
Timber.e("Failed to create video file");
return false;
--
Gitblit v1.8.0