更新ijk版本

neilyhe · neilyhe · commit b18b95863415 · 2025-07-15T15:30:30.000+08:00
diff --git a/sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/message/upload/ActivePushMessage.kt b/sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/message/upload/ActivePushMessage.kt
@@ -1,5 +1,8 @@
 package com.tencent.iot.explorer.link.core.auth.message.upload
 
+import com.tencent.iot.explorer.link.core.log.L
+
+
 class ActivePushMessage(deviceIds: ArrayString) : UploadMessage() {
 
     init {
@@ -9,6 +12,8 @@ class ActivePushMessage(deviceIds: ArrayString) : UploadMessage() {
 
     override fun toString(): String {
         reqId = 1
-        return super.toString()
+        val res = super.toString()
+        L.d("ActivePushMessage to string res:$res")
+        return res
     }
 }
diff --git a/sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/socket/WSClientManager.kt b/sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/auth/socket/WSClientManager.kt
@@ -344,6 +344,7 @@ internal class WSClientManager private constructor() {
             client?.run {
                 if (isConnected) {
                     send(message)
+                    L.d("sendMessage:$message")
                     return
                 }
             }
@@ -389,12 +390,15 @@ internal class WSClientManager private constructor() {
         client?.run {
             confirmQueue.forEach {
                 send(it.iotMsg.toString())
+                L.d("send text:${it.iotMsg}")
             }
             while (requestQueue.isNotEmpty()) {
                 send(requestQueue.poll()?.iotMsg.toString())
+                L.d("send text:${requestQueue.poll()?.iotMsg}")
             }
             while (messageList.isNotEmpty()) {
                 send(messageList.poll())
+                L.d("send text:${messageList.poll()}")
             }
         }
     }
diff --git a/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/AudioEncoder.java b/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/AudioEncoder.java
@@ -9,6 +9,7 @@
 import android.os.Build;
 import android.util.Log;
 
+import com.iot.gvoice.interfaces.GvoiceJNIBridge;
 import com.tencent.iot.video.link.listener.OnEncodeListener;
 import com.tencent.iot.video.link.param.AudioEncodeParam;
 import com.tencent.iot.video.link.param.MicParam;
@@ -228,6 +229,28 @@ private void record() {
                     readSize = audioRecord.read(inputBuffer, bufferSizeInBytes);
                 }
                 if (readSize >= 0) {
+//                    // 1. 取出录音PCM数据
+//                    byte[] micPcmBytes = new byte[readSize];
+//                    inputBuffer.position(0);
+//                    inputBuffer.get(micPcmBytes, 0, readSize);
+//                    inputBuffer.position(0); // 重置position
+//
+//                    // 2. 获取扬声器播放的PCM
+//                    byte[] playerPcmBytes = onReadPlayerPlayPcm(readSize);
+//
+//                    // 3. 回声消除
+//                    byte[] aecPcmBytes = null;
+//                    if (playerPcmBytes != null && playerPcmBytes.length == readSize) {
+//                        aecPcmBytes = GvoiceJNIBridge.cancellation(micPcmBytes, playerPcmBytes);
+//                    } else {
+//                        aecPcmBytes = micPcmBytes; // 没有播放数据就直接用原始
+//                    }
+//
+//                    // 4. 把消除后的PCM写回inputBuffer
+//                    inputBuffer.clear();
+//                    inputBuffer.put(aecPcmBytes, 0, aecPcmBytes.length);
+//                    inputBuffer.position(0);
+
                     audioCodec.queueInputBuffer(audioInputBufferId, 0, readSize, System.nanoTime() / 1000, 0);
                 }
             }
diff --git a/sdkdemo/build.gradle b/sdkdemo/build.gradle
@@ -142,11 +142,11 @@ dependencies {
         implementation 'com.tencent.iot.video:video-link-android:+'
     }
 
-//    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-java:1.0.7'
+//    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-java:1.0.7'jian
 //    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-armv7a:1.0.7'
-    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-java:2.0.18-SNAPSHOT'
-    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-armv7a:2.0.18-SNAPSHOT'
-    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-arm64:2.0.18-SNAPSHOT'
+    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-java:2.0.18'
+    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-armv7a:2.0.18'
+    implementation 'com.tencent.iot.thirdparty.android:ijkplayer-arm64:2.0.18'
 
     implementation 'cn.aigestudio.wheelpicker:WheelPicker:1.1.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7-mpp-dev-11'

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,7 @@ internal class WSClientManager private constructor() {`
`344`	`344`	`client?.run {`
`345`	`345`	`if (isConnected) {`
`346`	`346`	`send(message)`
	`347`	`+ L.d("sendMessage:$message")`
`347`	`348`	`return`
`348`	`349`	`}`
`349`	`350`	`}`
`@@ -389,12 +390,15 @@ internal class WSClientManager private constructor() {`
`389`	`390`	`client?.run {`
`390`	`391`	`confirmQueue.forEach {`
`391`	`392`	`send(it.iotMsg.toString())`
	`393`	`+ L.d("send text:${it.iotMsg}")`
`392`	`394`	`}`
`393`	`395`	`while (requestQueue.isNotEmpty()) {`
`394`	`396`	`send(requestQueue.poll()?.iotMsg.toString())`
	`397`	`+ L.d("send text:${requestQueue.poll()?.iotMsg}")`
`395`	`398`	`}`
`396`	`399`	`while (messageList.isNotEmpty()) {`
`397`	`400`	`send(messageList.poll())`
	`401`	`+ L.d("send text:${messageList.poll()}")`
`398`	`402`	`}`
`399`	`403`	`}`
`400`	`404`	`}`