From 8b004066992c3ff21348a7bfa44042d44d0b7088 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期三, 28 一月 2026 17:30:09 +0800
Subject: [PATCH] 1.p2摄像头 跨进程服务，未测试
---
app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java | 13 +++++++++++--
1 files changed, 11 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 fb85f0f..c362f04 100644
--- a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java
+++ b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java
@@ -586,8 +586,17 @@
// 鎵撳紑鎽勫儚澶翠箣鍓嶅厛璋冪敤setenv
usbCamera.setenv();
- // 浣跨敤prepareCamera鏂规硶锛宑amera_id鑼冨洿[0,2]
- int[] cameraIds = {0, 2};
+ // 浣跨敤 prepareCamera 鏂规硶锛涙牴鎹� MediaArgu.usbCameraId 閫夋嫨鍏蜂綋鎽勫儚澶�
+ // usbCameraId: 1 -> P1(0), 2 -> P2(2), 鍏朵粬 -> 璁╁簱鑷鍦� {0,2} 閲岄�夋嫨
+ int usbId = (mediaArgu != null) ? mediaArgu.getUsbCameraId() : 0;
+ int[] cameraIds;
+ if (usbId == 2) {
+ cameraIds = new int[]{2};
+ } else if (usbId == 1) {
+ cameraIds = new int[]{0};
+ } else {
+ cameraIds = new int[]{0, 2};
+ }
String cameraName = null; // 涓嶆寚瀹氱壒瀹氬悕绉�
// 濡傛灉杩斿洖闈�0锛屼唬琛ㄦ墦寮�澶辫触锛屽垯鍏坰topCamera鍐嶉噸璇曪紝鏈�澶�3娆�
--
Gitblit v1.8.0