From 01d3f5e8c14cfcfe48aa528fb5de45f046a633b0 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期五, 06 二月 2026 13:38:43 +0800
Subject: [PATCH] 1.录像、推流 回调，关联摄像头 2.推流 startPush主线程（P2 3.
---
app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java b/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java
index 15797d8..a6c1b10 100644
--- a/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java
+++ b/app/src/main/java/com/safeluck/floatwindow/P2UsbCameraVideoService.java
@@ -115,13 +115,13 @@
private void startMedia(MediaArgu media) {
if (media == null) {
- notifyCallback(1, -1, "MediaArgu is null");
+ notifyCallback(1, -1, "MediaArgu is null",2);
return;
}
// 璇ユ湇鍔″彧澶勭悊 USB 鎽勫儚澶�
if (!media.isUsedOutCamera()) {
- notifyCallback(1, -4, "P2 service only supports USB camera");
+ notifyCallback(1, -4, "P2 service only supports USB camera",2);
return;
}
@@ -186,8 +186,16 @@
mCallbacks.finishBroadcast();
}
- private void notifyCallback(int type, int errCode, String message) {
+ /***
+ *
+ * @param type
+ * @param errCode
+ * @param message
+ * @param cameraId 0-鍐呯疆鎽勫儚澶达紙android camera锛� 1-P1 2-P2
+ */
+ private void notifyCallback(int type, int errCode, String message,int cameraId) {
ResponseVO response = new ResponseVO();
+ response.setCameraId(cameraId);
response.setType(type);
response.setErrCode(errCode);
response.setMessage(message);
--
Gitblit v1.8.0