diff --git a/README.md b/README.md index be723a0..2f1cba2 100644 --- a/README.md +++ b/README.md @@ -32,16 +32,16 @@ |功能|是否支持|是否实现|描述| |:--|:--|:--|:--| -|P2P|支持|完成|P2P监控模式| -|WebRTC|支持|完成|视频房间| +|P2P|支持|完成|视频会话(监控)| +|WebRTC|支持|完成|视频房间(会话)| |控制|支持|完成|完整控制信令| ### 安卓终端功能 |功能|是否支持|是否实现|描述| |:--|:--|:--|:--| -|P2P|支持|完成|P2P监控模式| -|WebRTC|支持|完成|视频房间| +|P2P|支持|完成|视频会话(监控)| +|WebRTC|支持|完成|视频房间(会议)| |控制|支持|完成|部分控制信令| |拍照|支持|完成|拍照| |录像|支持|完成|录制| diff --git a/docs/Deploy.md b/docs/Deploy.md index dac23d5..72d2b32 100644 --- a/docs/Deploy.md +++ b/docs/Deploy.md @@ -8,6 +8,7 @@ git >= 1.8.0 pm2 >= 5.2.0 Java >= 17.0.0 Maven >= 3.8.0 +Android >= 10 gcc/g++ >= 10.2.0 node version >= v16.18.0 python version >= 3.8.0 with PIP @@ -285,6 +286,31 @@ cd /data git clone https://gitee.com/acgist/taoyao.git --recursive ``` +## 安装信令 + +``` +# 编译代码 +cd /data/taoyao/taoyao-signal-server +mvn clean package -D skipTests +#mvn clean package -D skipTests -P prd + +# 拷贝脚本 +cp taoyao-server/target/taoyao-server-1.0.0/bin/deploy.sh ./ + +# 配置服务 +cp /data/taoyao/docs/etc/taoyao-signal-server.service /usr/lib/systemd/system/taoyao-signal-server.service + +# 配置自启 +systemctl daemon-reload +systemctl enable taoyao-signal-server + +# 执行脚本 +./deploy.sh + +# 管理服务 +systemctl start | stop | restart taoyao-signal-server +``` + ## 安装媒体 ``` @@ -322,31 +348,6 @@ make make clean ``` -## 安装信令 - -``` -# 编译代码 -cd /data/taoyao/taoyao-signal-server -mvn clean package -D skipTests -#mvn clean package -D skipTests -P prd - -# 拷贝脚本 -cp taoyao-server/target/taoyao-server-1.0.0/bin/deploy.sh ./ - -# 配置服务 -cp /data/taoyao/docs/etc/taoyao-signal-server.service /usr/lib/systemd/system/taoyao-signal-server.service - -# 配置自启 -systemctl daemon-reload -systemctl enable taoyao-signal-server - -# 执行脚本 -./deploy.sh - -# 管理服务 -systemctl start | stop | restart taoyao-signal-server -``` - ## 安装Web终端 ``` diff --git a/taoyao-client-android/README.md b/taoyao-client-android/README.md index 7a78c63..d8f8866 100644 --- a/taoyao-client-android/README.md +++ b/taoyao-client-android/README.md @@ -40,7 +40,7 @@ * https://github.com/haiyangwu/mediasoup-demo-android * https://github.com/haiyangwu/mediasoup-client-android -## 其他实现 +## 现有实现 * `org.webrtc:google-webrtc` * `io.github.haiyangwu:mediasoup-client` diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/RoomClient.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/RoomClient.java index 9f9b096..62956f1 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/RoomClient.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/RoomClient.java @@ -6,7 +6,7 @@ import com.acgist.taoyao.media.signal.ITaoyao; /** * 房间终端 - * 使用SDK + NDK + Mediasoup实现多人会话 + * SDK + NDK + Mediasoup实现视频房间会话 * * @author acgist */ diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/SessionClient.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/SessionClient.java index 0983a75..aa24d11 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/SessionClient.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/client/SessionClient.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.function.Consumer; /** - * P2P终端 - * 使用安卓SDK + WebRTC实现P2P会话 + * 视频会话 + * SDK + WebRTC实现视频会话 * * 注意: * 2. offer/answer/candidate枚举大小 diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java index 4e5c8ec..84ef715 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/config/WebrtcProperties.java @@ -10,7 +10,6 @@ import java.util.List; /** * WebRTC配置 - * P2P视频监控会用,正常会议不会使用,需要自己搭建`coturn`服务。 * * @author acgist */