From 3c2194940ca57b45b66a6344ad67e9c9f0b861bd Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期四, 29 一月 2026 13:28:18 +0800
Subject: [PATCH] 1.修改水印 usb
---
app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java
index 7a82c9f..076ada8 100644
--- a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java
+++ b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java
@@ -283,7 +283,11 @@
int fontSize= 24;
private ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
private void setWaterMask() {
-
+ if (mediaArgu.getUsbCameraId()==2){
+ GlobalData.getInstance().getCameraTag="_P2";
+ }else{
+ GlobalData.getInstance().getCameraTag="_P1";
+ }
// 闃叉閲嶅 schedule锛坰tartPush 鍙兘琚娆¤皟鐢級
if (watermarkFuture != null && !watermarkFuture.isCancelled()) {
return;
@@ -329,7 +333,10 @@
double speed = GlobalData.getInstance().parseWaterMaskInfo("speed", 0.0, GlobalData.ShareType.DOUBLE);
- String czh = GlobalData.getInstance().parseWaterMaskInfo("car_license", "鏃�", GlobalData.ShareType.STRING) + GlobalData.getInstance().getCameraTag;
+ String czh = GlobalData.getInstance().parseWaterMaskInfo("car_license", "鏃�", GlobalData.ShareType.STRING) +
+
+ GlobalData.getInstance().getCameraTag;
+
baseY = fontSize*11/10+baseY;
watermarkParam = new WatermarkParam(10,resolutionArr[1]-baseY,czh +" "+String.format("閫熷害锛�%.1f",speed));
watermarkParamList.add(watermarkParam);
--
Gitblit v1.8.0