From 9db40b629d81c7b68e8aee42459b2775c0848c81 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Sun, 14 May 2023 09:56:32 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E6=AF=8F=E6=97=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docs/TODO.md | 2 ++ taoyao-client-android/taoyao/README.md | 9 +++++++++ .../taoyao/client/src/main/AndroidManifest.xml | 3 +++ .../com/acgist/taoyao/client/MediaService.java | 15 +++++++++------ .../client/src/main/res/drawable/action.xml | 13 +++++++++---- .../client/src/main/res/drawable/photograph.xml | 17 ++++++++++++----- .../client/src/main/res/drawable/record.xml | 13 +++++++++---- .../client/src/main/res/drawable/settings.xml | 13 +++++++++---- .../src/main/res/layout/activity_main.xml | 4 +--- .../client/src/main/res/values/settings.xml | 12 ++++++------ .../client/src/main/res/values/strings.xml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 8 ++++---- taoyao-client-web/src/components/Config.js | 13 +++++++------ taoyao-client-web/src/components/Taoyao.js | 3 +++ 15 files changed, 85 insertions(+), 44 deletions(-) create mode 100644 taoyao-client-android/taoyao/README.md diff --git a/README.md b/README.md index ee67f02..c1d32c0 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ |:--|:--|:--| |taoyao-client-web|Web终端|Web终端| |taoyao-client-media|媒体终端|媒体服务| -|taoyao-signal-server|信令服务|终端信令控制| |taoyao-client-android|安卓终端|安卓终端| +|taoyao-signal-server|信令服务|终端信令控制| ### Web终端功能 diff --git a/docs/TODO.md b/docs/TODO.md index f910fcc..13b7fb6 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -34,7 +34,9 @@ getter/setter * 录制底噪 * 分辨率调整 * 降低视频录制大小 +* 防止重复邀请拉取 * 查询消费者生产者信息 +* 浏览器WebRTC监控页面关闭 ## 完成任务 diff --git a/taoyao-client-android/taoyao/README.md b/taoyao-client-android/taoyao/README.md new file mode 100644 index 0000000..fe21cec --- /dev/null +++ b/taoyao-client-android/taoyao/README.md @@ -0,0 +1,9 @@ +# 桃夭安卓 + +## WebRTC源码修改 + +### JavaAudioDeviceModule + +### WebRtcAudioRecord + +### WebRtcAudioTrack \ No newline at end of file diff --git a/taoyao-client-android/taoyao/client/src/main/AndroidManifest.xml b/taoyao-client-android/taoyao/client/src/main/AndroidManifest.xml index 0708e38..3f699a9 100644 --- a/taoyao-client-android/taoyao/client/src/main/AndroidManifest.xml +++ b/taoyao-client-android/taoyao/client/src/main/AndroidManifest.xml @@ -26,17 +26,20 @@ + + + - + + diff --git a/taoyao-client-android/taoyao/client/src/main/res/drawable/photograph.xml b/taoyao-client-android/taoyao/client/src/main/res/drawable/photograph.xml index 43a4fd5..5306e15 100644 --- a/taoyao-client-android/taoyao/client/src/main/res/drawable/photograph.xml +++ b/taoyao-client-android/taoyao/client/src/main/res/drawable/photograph.xml @@ -1,6 +1,13 @@ - - - + + + diff --git a/taoyao-client-android/taoyao/client/src/main/res/drawable/record.xml b/taoyao-client-android/taoyao/client/src/main/res/drawable/record.xml index b3d8455..df01bbe 100644 --- a/taoyao-client-android/taoyao/client/src/main/res/drawable/record.xml +++ b/taoyao-client-android/taoyao/client/src/main/res/drawable/record.xml @@ -1,5 +1,10 @@ - - + + diff --git a/taoyao-client-android/taoyao/client/src/main/res/drawable/settings.xml b/taoyao-client-android/taoyao/client/src/main/res/drawable/settings.xml index 298a5a1..b0a938c 100644 --- a/taoyao-client-android/taoyao/client/src/main/res/drawable/settings.xml +++ b/taoyao-client-android/taoyao/client/src/main/res/drawable/settings.xml @@ -1,5 +1,10 @@ - - + + diff --git a/taoyao-client-android/taoyao/client/src/main/res/layout/activity_main.xml b/taoyao-client-android/taoyao/client/src/main/res/layout/activity_main.xml index 9bcae2e..e1000c0 100644 --- a/taoyao-client-android/taoyao/client/src/main/res/layout/activity_main.xml +++ b/taoyao-client-android/taoyao/client/src/main/res/layout/activity_main.xml @@ -11,9 +11,7 @@ android:id="@+id/video" android:layout_width="match_parent" android:layout_height="match_parent" - android:columnCount="2"> - - + android:columnCount="2"> DES 2SPWy+TF1zM= - - /taoyao - - /taoyao - - BACK false @@ -46,6 +40,12 @@ 1 1 + + /taoyao + + /taoyao "'TAOYAO' yyyy-MM-dd HH:mm:ss" + + BACK diff --git a/taoyao-client-android/taoyao/client/src/main/res/values/strings.xml b/taoyao-client-android/taoyao/client/src/main/res/values/strings.xml index a9b1eb7..b13f75c 100644 --- a/taoyao-client-android/taoyao/client/src/main/res/values/strings.xml +++ b/taoyao-client-android/taoyao/client/src/main/res/values/strings.xml @@ -3,10 +3,10 @@ 桃夭 桃夭终端预览 桃夭终端设置 - 拍照 动作 录像 设置 + 拍照 连接 信令端口 信令地址 diff --git a/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties b/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties index f3ba374..f3074cb 100644 --- a/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties +++ b/taoyao-client-android/taoyao/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Mar 20 09:51:37 CST 2023 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists diff --git a/taoyao-client-web/src/components/Config.js b/taoyao-client-web/src/components/Config.js index efe94ad..e0b05d8 100644 --- a/taoyao-client-web/src/components/Config.js +++ b/taoyao-client-web/src/components/Config.js @@ -1,16 +1,17 @@ /** * 音频默认配置 * TODO：MediaStreamTrack.applyConstraints() - * 播放音量、采集音量 + * TODO：播放音量（audio标签配置）、采集音量 + * 支持属性：navigator.mediaDevices.getSupportedConstraints() * https://developer.mozilla.org/en-US/docs/Web/API/MediaTrackSettings */ const defaultAudioConfig = { // 设备 // deviceId : '', - // 音量：0~1 - volume: 1.0, - // 延迟大小（单位毫秒）：500毫秒以内较好 - latency: 0.4, + // 音量（废弃）：0.0~1.0 + // volume: 1.0, + // 延迟时间（单位：秒）：500毫秒以内较好 + // latency: 0.4, // 采样位数：8|16|32 sampleSize: { min: 8, ideal: 16, max: 32 }, // 采样率：8000|16000|32000|48000 @@ -18,7 +19,7 @@ const defaultAudioConfig = { // 声道数量：1|2 channelCount: 1, // 是否开启自动增益：true|false - autoGainControl: false, + autoGainControl: true, // 是否开启降噪功能：true|false noiseSuppression: true, // 是否开启回音消除：true|false diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js index 1c1ab4d..890c6c6 100644 --- a/taoyao-client-web/src/components/Taoyao.js +++ b/taoyao-client-web/src/components/Taoyao.js @@ -1539,6 +1539,7 @@ class Taoyao extends RemoteClient { this.callbackError("无效房间"); return; } + // TODO：已经进入房间忽略 me.roomId = roomId; const response = await me.request( protocol.buildMessage("media::router::rtp::capabilities", { @@ -1581,6 +1582,7 @@ class Taoyao extends RemoteClient { if (clientId === me.clientId) { // 忽略自己 } else { + // TODO：已经存在忽略 me.remoteClients.set(clientId, new RemoteClient(status)); } } @@ -1634,6 +1636,7 @@ class Taoyao extends RemoteClient { const me = this; // 默认进入，如果需要确认使用回调函数重写。 const { roomId, password } = message.body; + // TODO：已经进入房间拒绝 // if(me.roomId) { // this.callbackError(); // return;