From 5017b0589513ea4b1cfa23d9fb2a64d2e1a00c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E7=A3=8A=E5=A9=B7?= <994812516@qq.com> Date: Tue, 1 Aug 2023 20:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BA=92=E5=8A=A8=E7=99=BD?= =?UTF-8?q?=E6=9D=BF=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/sidebar/private.ts | 6 +++--- docs/private/media/common_clientsdk.md | 4 +++- docs/private/media/common_introduction.md | 2 +- docs/private/media/conference_android.md | 11 +++++------ docs/private/media/conference_introduction.md | 6 ++++-- docs/private/media/conference_ios.md | 10 +++++----- docs/private/media/conference_web.md | 2 +- docs/private/media/one2one_android.md | 1 - docs/private/media/scenario_live.md | 4 ++-- docs/private/media/scenario_meeting.md | 6 +++--- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/docs/.vuepress/sidebar/private.ts b/docs/.vuepress/sidebar/private.ts index 6e6d35f6f..7d0d03107 100644 --- a/docs/.vuepress/sidebar/private.ts +++ b/docs/.vuepress/sidebar/private.ts @@ -57,7 +57,7 @@ export const PRIVATE_MEDIA_SIDEBAR = [ { text: 'PC集成', link: 'conference_pcdesktop.html' }, ] } , - { + /*{ text: '互动白板', children: [ { text: '功能简介', link: 'whiteboard_introduction.html' }, @@ -67,14 +67,14 @@ export const PRIVATE_MEDIA_SIDEBAR = [ { text: '微信小程序集成', link: 'whiteboard_vxmini.html' }, { text: 'PC集成', link: 'whiteboard_pcdesktop.html' }, ] - } , + } ,*/ { text: 'REST接口', children: [ { text: '功能简介', link: 'rest_introduction.html' }, { text: '会议管理', link: 'rest_manage.html' }, { text: '录制及提取', link: 'rest_record.html' }, - { text: '互动白板', link: 'rest_whiteboard.html' }, + /*{ text: '互动白板', link: 'rest_whiteboard.html' },*/ ] } , { diff --git a/docs/private/media/common_clientsdk.md b/docs/private/media/common_clientsdk.md index 03b8b57f3..c3ddcddf9 100644 --- a/docs/private/media/common_clientsdk.md +++ b/docs/private/media/common_clientsdk.md @@ -51,7 +51,7 @@ 桌面端下载代码体验Windows Demo

体验MAC Demo - + \ No newline at end of file diff --git a/docs/private/media/common_introduction.md b/docs/private/media/common_introduction.md index 7c54057ca..f5910d34a 100644 --- a/docs/private/media/common_introduction.md +++ b/docs/private/media/common_introduction.md @@ -23,7 +23,7 @@ ![img](@static/images/privitization/em-rtcsdk-architecture.png) -环信音视频SDK提供3套API体系，[1对1通话](one2one_introduction)，[多人通话](conference_introduction)，[互动白板](whiteboard_introduction)，以上API能满足客户的绝大多数使用场景。 +环信音视频SDK提供3套API体系，[1对1通话](one2one_introduction)，[多人通话](conference_introduction)，以上API能满足客户的绝大多数使用场景。 ## 典型场景 diff --git a/docs/private/media/conference_android.md b/docs/private/media/conference_android.md index 6f80b027c..316262041 100644 --- a/docs/private/media/conference_android.md +++ b/docs/private/media/conference_android.md @@ -1933,7 +1933,6 @@ EMConferenceListener#onPassiveLeave(final int error, final String message) | [updateLiveLayout](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a08f1d1f058cb40a6bf745dfa4e0ab1e1) | 更新CDN推流布局 | | [stopLiveStream](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a6f154980142e31629ca5786d756f38fa) | 停止CDN推流 | | [addLiveStream](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a1682b222486d14ffd77da06a6c111c88) | 增加CDN旁路推流 | -| [stopLiveStream](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a6f154980142e31629ca5786d756f38fa) | 停止CDN推流 | | [enableRecordLivestream](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#abf0e222c3ec094c9dea7ec9c7b89a1a1) | 开启或停止录制CDN的流 | | [joinConferenceWithTicket](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#aab4ae14065e192f9a1f284443c911149) | 通过Ticket加入会议 | | [inviteUserToJoinConference](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a46185b19b85ee8366c0f22ef36a3e05e) | 邀请其他人加入会议 | @@ -1970,17 +1969,17 @@ EMConferenceListener#onPassiveLeave(final int error, final String message) | [getSubscribedStreamMap](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a8332e86b981056d930dde2965c047274) | 获取当前会议已订阅 Stream | | [setLocalVideoViewMirror](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#acc62694d0c18068081209f6d987b0db6) | 设置本地视频view镜像 | | [setRotation](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#ad29c3544ec98b0ac4596d7d9abe35df9) | 设置视频会议中Camera采集到的VideoFrame的rotation | -| [createWhiteboardRoom](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#ad386890a370780b0dd4f80a1406a65b7) | 创建白板房间 | -| [destroyWhiteboardRoom](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a887013e116d229c48b45ce12177051f4) | 销毁白板房间 | -| [joinWhiteboardRoomWithId](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a4aaf75f7416029bca4c3dc98bcbb81b9) | 通过白板id加入房间 | -| [joinWhiteboardRoomWithName](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a39704e3e68b7786261d4de0b3005409f) | 通过白板名称加入房间 | -| [updateWhiteboardRoomWithRoomId](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#ae005fa11c9f9087f6582fff84340f363) | 通过白板id修改白板操作权限 | | [applyTobeSpeaker](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a59d53f3c392714f201486d788f38cf07) | 发送上麦请求 | | [handleSpeakerApplication](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#affaa83f9c32e5a99caa7ec0627ddfcb2) | 管理员处理上麦请求 | | [applyTobeAdmin](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a5240c7d53051f0d14b27f0a59a2fc945) | 发送申请管理员请求 | | [handleAdminApplication](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a5240c7d53051f0d14b27f0a59a2fc945:~:text=hyphenate.chat.EMConferenceManager.-,handleAdminApplication) | 管理员处理申请管理员请求 | | [muteMember](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a5176c44768bec0b59578315281dae6ad) | 发送静音命令 | | [unmuteMember](http://sdkdocs.easemob.com/apidoc/android/chat3.0/classcom_1_1hyphenate_1_1chat_1_1_e_m_conference_manager.html#a5176c44768bec0b59578315281dae6ad:~:text=hyphenate.chat.EMConferenceManager.-,unmuteMember) | 发送解除静音命令 | + ### EMConference diff --git a/docs/private/media/conference_introduction.md b/docs/private/media/conference_introduction.md index 58d70ff2b..bb196f6ee 100644 --- a/docs/private/media/conference_introduction.md +++ b/docs/private/media/conference_introduction.md @@ -84,7 +84,7 @@ SDK端创建和操作音视频会议的过程简单来说，可以分为以下 桌面端下载代码体验Windows Demo

体验MAC Demo - + + diff --git a/docs/private/media/conference_ios.md b/docs/private/media/conference_ios.md index 706b93dd8..4bf4035f8 100644 --- a/docs/private/media/conference_ios.md +++ b/docs/private/media/conference_ios.md @@ -1560,7 +1560,7 @@ aMemberName 是appkey拼接环信id，例如：easemob-demo#chatdemoui_lulu1 | [requestTobeAdmin:adminId:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#af2e99d266d5d3f67490903b17818b17c) | 主播申请成为管理员， | | [responseReqSpeaker:memId:result:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a097c52f9ea833b9ac289290247c25860) | 管理员同意/拒绝观众的上麦申请，管理员调用 | | [responseReqAdmin:memId:result:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a34ff57a1a78c507d5118249e4863b8ff) | 管理员同意/拒绝主播的申请管理员请求，管理员调用 | -| [setMuteMember:memId:mute:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a6432c2f2a68760b1cad2dabb6e9cba6d) | 将指定成员静音/解除静音，管理员调用 | +| [setMuteMember:memId: mute:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a6432c2f2a68760b1cad2dabb6e9cba6d) | 将指定成员静音/解除静音，管理员调用 | | [updateConferenceWithSwitchCamera:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a28bd7490cb8e238a07a5aec62d164cea) | 切换前后摄像头 | | [updateConference:isMute:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#abc3d1658875a99bdd1f5f1158a74e789) | 设置是否静音 | | [updateConference:enableVideo:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a478c1c8b08758a55fdea520d6772ae9e) | 设置视频是否可用 | @@ -1569,11 +1569,11 @@ aMemberName 是appkey拼接环信id，例如：easemob-demo#chatdemoui_lulu1 | [inputVideoPixelBuffer:sampleBufferTime:rotation:conference:publishedStreamId:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a544a757e0f2a16c9b265243c784f1fd4) | 输入自定义本地视频数据 | | [setConferenceAttribute:value:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#ae98d762cb6aed35de22da40779455fcb) | 设置会议属性， | | [deleteAttributeWithKey:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a226dbe5816201a32fa3850dd1bb3c991) | 删除频道属性 | -| [startAudioMixing:loop:sendMix:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#aa7e7d1a088f746f98b796d94b3eb631d) | 开启本地伴音功能 | +| [startAudioMixing: loop:sendMix:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#aa7e7d1a088f746f98b796d94b3eb631d) | 开启本地伴音功能 | | [stopAudioMixing](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a703c15925f723cc3c4ec59f347226a91) | 关闭本地混音功能 | | [adjustAudioMixingVolume:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a9b9a168a7e160ff08b5ccf13d2b8ab2f) | 设置伴奏音量 | -| [muteRemoteAudio:mute:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a28f9297ad2411c6aa9bdbb291bb8df26) | mute远端音频 | -| [muteRemoteVideo:mute:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a870a36303635529c953194b9d240521b) | mute远端视频 | +| [muteRemoteAudio: mute:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a28f9297ad2411c6aa9bdbb291bb8df26) | mute远端音频 | +| [muteRemoteVideo: mute:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a870a36303635529c953194b9d240521b) | mute远端视频 | | [enableStatistics:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#aa57d7c7aaec58f84fb0f81b38f36a2e4) | 启用统计 | | [muteAll:completion:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a0a7340e4fe935143ba0ff529858ad295) | 全体静音 | | [inputCustomAudioData:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_i_e_m_conference_manager-p.html#a2fb9faf9d767ed2e58315c1db354df37) | 输入自定义外部音频数据 | @@ -1602,7 +1602,7 @@ aMemberName 是appkey拼接环信id，例如：easemob-demo#chatdemoui_lulu1 | [conferenceAttributeUpdated:attributes:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#a0917065a18ca3ce9433d6677288830c3) | 会议属性变更 | | [conferenceReqSpeaker:memId:nickName:memName:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#afca1af08d628fd0be0ddd1bed1bf9138) | 收到观众申请主播的请求，只有管理员会触发 | | [conferenceReqAdmin:memId:nickName:memName:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#ad90e5d598c1b8cb57a02cd6b81fc929e) | 收到主播申请管理员的请求，只有管理员会触发 | -| [conferenceDidUpdated:mute:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#a2b09dd5dbb6144cc561027378bc3f1e7) | 收到静音/解除静音的回调 | +| [conferenceDidUpdated: mute:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#a2b09dd5dbb6144cc561027378bc3f1e7) | 收到静音/解除静音的回调 | | [conferenceReqSpeakerRefused:adminId:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#ae598e6c668121780573ce2402be3d745) | 收到申请主播请求被拒绝的回调 | | [conferenceReqAdminRefused:adminId:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#aa285cef35bc14db40ef17be9245798ed) | 收到申请管理员请求被拒绝的回调 | | [conferenceDidUpdated:liveCfg:](http://sdkdocs.easemob.com/apidoc/ios/chat3.0/protocol_e_m_conference_manager_delegate-p.html#acccb25d9f4eef388781be85cfeefb5ff) | 会议开启cdn推流或自定义录制，收到LiveCfg的回调，只有管理员能收到 | diff --git a/docs/private/media/conference_web.md b/docs/private/media/conference_web.md index 31c842516..56f54527d 100644 --- a/docs/private/media/conference_web.md +++ b/docs/private/media/conference_web.md @@ -728,7 +728,7 @@ emedia.mgr.switchMobileCamera(confrId).then(function(){ #### **6. 音视频网络状态监听** :::tip -建议进入会议之前绑定网络状态监听函数** +建议进入会议之前绑定网络状态监听函数 ::: ``` //监听弱网状态 diff --git a/docs/private/media/one2one_android.md b/docs/private/media/one2one_android.md index 109406223..d69970715 100644 --- a/docs/private/media/one2one_android.md +++ b/docs/private/media/one2one_android.md @@ -660,7 +660,6 @@ EMClient.getInstance().callManager().setWaterMark(watermark); | getConnectType | 连接类型 | | isRecordOnServer | 是否启用服务器录制 | | getServerRecordId | 获取录制ID | -| getServerRecordId | 获取录制ID | | getExt | 获取消息扩展 | ### EMVideoCallHelper diff --git a/docs/private/media/scenario_live.md b/docs/private/media/scenario_live.md index 836c2400a..03b9c034b 100644 --- a/docs/private/media/scenario_live.md +++ b/docs/private/media/scenario_live.md @@ -69,7 +69,7 @@ web端: [聊天室管理](http://docs-im-beta.easemob.com/document/web/room_over PC端: [聊天室管理](https://docs-im.easemob.com/im/pc/basics/chatroom) -如果需要互动白板高级功能，请详见文档： + \ No newline at end of file diff --git a/docs/private/media/scenario_meeting.md b/docs/private/media/scenario_meeting.md index 29c21f221..10d6a2bca 100644 --- a/docs/private/media/scenario_meeting.md +++ b/docs/private/media/scenario_meeting.md @@ -15,7 +15,6 @@ - 多人音频通话 - 多人视频通话 - 共享桌面 -- 互动白板 - 外部视频源输入 - 美颜 - 服务器端录制及下载 @@ -24,6 +23,7 @@ - 会议室的管理：创建会议、删除会议、获取指定会议室详情、加入会议室、退出会议室 - 会议室的人员管理：获取会议室参会人名列表、踢人，设置观众为主播，设置主播为观众等 - 多端支持：Android、iOS、Web、PC、小程序 + :::notice 在多人视频会议场景下用到的某些功能需要在特定的浏览器、版本或插件下才能使用。
所以为了简化用户体验，不推荐直接使用浏览器，**建议引导用户使用本地应用（如PC端应用）**。 @@ -54,7 +54,7 @@ web端: [聊天室管理](http://docs-im-beta.easemob.com/document/web/room_over PC端: [聊天室管理](https://docs-im.easemob.com/im/pc/basics/chatroom) -3. 如果需要互动白板高级功能，请详见文档： + ## 客户端应用源码