From 8d84949e15636f0afe0012c2fa776d922fc2c5e6 Mon Sep 17 00:00:00 2001
From: Dana <Dana_Lee1016@126.com>
Date: 星期三, 28 一月 2026 13:41:16 +0800
Subject: [PATCH] 1.usb 推流添加声音 之后，没有画面，先暂时去掉声音
---
app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java | 4 ++--
app/.gitignore | 3 ++-
.gitignore | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index aa724b7..2e036f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,52 @@
.externalNativeBuild
.cxx
local.properties
+/usbcameralib/.cxx/
+/.kotlin/
+
+# Build directories
+build/
+**/build/
+**/.cxx/
+**/.kotlin/
+**/.gradle/
+**/build/
+**/intermediates/
+**/generated/
+**/outputs/
+**/.externalNativeBuild/
+
+# Android Studio
+*.iml
+.idea/
+.gradle/
+local.properties
+*.apk
+*.ap_
+*.aab
+
+# NDK
+obj/
+.externalNativeBuild/
+.cxx/
+
+# Kotlin
+.kotlin/
+
+# Generated files
+*.class
+*.dex
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# Log files
+*.log
+
+# OS files
+.DS_Store
+Thumbs.db
diff --git a/app/.gitignore b/app/.gitignore
index 42afabf..3758503 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
-/build
\ No newline at end of file
+/build
+/build/
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 a43aef8..9cdec44 100644
--- a/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java
+++ b/app/src/main/java/com/safeluck/floatwindow/manager/UsbCameraPushManager.java
@@ -139,7 +139,7 @@
public void stopPush() {
Timber.d("stopPush called");
stopPushThread();
- stopAudioTransfer();
+// stopAudioTransfer();
releaseAlivcPusher();
if (usbCamera != null) {
usbCamera.stopCamera();
@@ -301,7 +301,7 @@
public void onPushStarted(AlivcLivePusher alivcLivePusher) {
Timber.d("onPushStarted");
pushStarted = true;
- startAudioTransfer();
+// startAudioTransfer();
notifyCallback(1, 0, "鎺ㄦ祦宸插紑濮嬶紝鍒嗚鲸鐜�: " + resolutionArr[0] + "x" + resolutionArr[1]);
}
--
Gitblit v1.8.0