From 180088121990fc451e39b23ab7ed905c4bac6414 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Thu, 23 Jul 2026 12:14:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E8=B5=84=E6=BA=90ID?= =?UTF-8?q?=20typo=20=E5=8F=8A=E5=8D=95=E5=85=83=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正布局文件中 `@+rid` 为 `@+id` 的 typo，将 UNIT_TYPE 常量类型从 int 改为 byte 以保持协议一致性，新增 StreamModeReportListener 接口，并将日志级别从 error 调整为 debug。 --- .../java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java | 4 ++-- .../main/java/com/ttstd/controller/webrtc/WebRtcClient.java | 6 +++++- WebRTCController/app/src/main/res/layout/activity_main.xml | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java b/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java index f48607e..57fe4cb 100644 --- a/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java +++ b/WebRTCControlled/app/src/main/java/com/ttstd/controlled/webrtc/SelfCodecEncoder.java @@ -29,8 +29,8 @@ public class SelfCodecEncoder { // ---- 自定义二进制协议（与控制端 SelfCodecDecoder 保持一致）---- private static final byte MAGIC = (byte) 0xAB; private static final int CHUNK_SIZE = 16384; // 每个 DataChannel 分片大小 - private static final int UNIT_TYPE_CONFIG = 1; // SPS/PPS 等参数集 - private static final int UNIT_TYPE_FRAME = 2; // 编码帧 + private static final byte UNIT_TYPE_CONFIG = 1; // SPS/PPS 等参数集 + private static final byte UNIT_TYPE_FRAME = 2; // 编码帧 private static final String TAG = "SelfCodecEncoder"; diff --git a/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java b/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java index ff9f108..e224a4b 100644 --- a/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java +++ b/WebRTCController/app/src/main/java/com/ttstd/controller/webrtc/WebRtcClient.java @@ -64,6 +64,10 @@ public class WebRtcClient { void onDisconnected(); } + public interface StreamModeReportListener { + void onStreamModeReported(int mode); + } + private ConnectionListener connectionListener; public WebRtcClient(Context context, WebSocketClient wsClient, String deviceId) { @@ -395,7 +399,7 @@ public class WebRtcClient { } private void sendIceCandidate(IceCandidate candidate, String controlledId) { - Log.e(TAG, "sendIceCandidate: " ); + Log.d(TAG, "sendIceCandidate: " ); SignalMessage msg = new SignalMessage(); msg.setType("ICE_CANDIDATE"); msg.setFromDeviceId(deviceId); diff --git a/WebRTCController/app/src/main/res/layout/activity_main.xml b/WebRTCController/app/src/main/res/layout/activity_main.xml index a182f7a..f0dfb1e 100644 --- a/WebRTCController/app/src/main/res/layout/activity_main.xml +++ b/WebRTCController/app/src/main/res/layout/activity_main.xml @@ -160,8 +160,9 @@ android:backgroundTint="#E53935" android:text="断开连接" android:textColor="@android:color/white" /> +