Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加查询房间信息 #3053

Open
wants to merge 6 commits into
base: FlexibleClassroom_dev_2.8.30
Choose a base branch
from
Open

增加查询房间信息 #3053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d6da560
add token update launch error
pmmgithub May 10, 2023
74f2e49
Merge pull request #3047 from AgoraIO/FlexibleClassroom_dev_2.8.30
SunGiantor May 11, 2023
ecaf11b
Merge branch 'FlexibleClassroom_dev' of https://github.com/AgoraIO/ag…
pmmgithub May 12, 2023
95c6363
2.8.30
pmmgithub May 12, 2023
b1cb4e6
增加查询房间信息
sadiea May 12, 2023
3b8cc84
Merge branch 'AgoraIO:FlexibleClassroom_dev' into FlexibleClassroom_dev
sadiea May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions dita/flexible-classroom/edu-context/API/api_onaudiorawdatabeforemixed.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
<reference id="api_onaudiorawdatabeforemixed">
<title><ph keyref="onAudioRawDataBeforeMixed"/></title>
<shortdesc id="short"><ph id="shortdesc">收到远端多路音频流，在将多路音频流合为一路音频流前抛出的音频数据。</ph></shortdesc>
<prolog>
<metadata>
<keywords>
<indexterm keyref="onAudioRawDataBeforeMixed"/>
</keywords>
</metadata>
</prolog>
<refbody>
<section id="prototype">
<p outputclass="codeblock">
<codeblock props="android" outputclass="language-kotlin">fun onAudioRawDataBeforeMixed(data: FcrAudioRawData)</codeblock>
<codeblock props="ios mac" outputclass="language-swift">FrcAudioRawData onAudioRawDataBeforeMixed(FrcAudioRawData data)</codeblock>
<codeblock props="windows" outputclass="language-cpp"/>
<codeblock props="web" outputclass="language-typescript"/> </p>
</section>
<section id="detailed-desc">
<note>SDK 只能抛出采样率为 48K，双声道的数据。</note>
</section>
<section id="parameters">
<title>参数</title>
<parml>
<plentry>
<pt>data</pt>
<pd>音频数据，详见 <xref keyref="FcrAudioRawData"/>。</pd>
</plentry>
<plentry>
<pt>streamUuid</pt>
<pd>流 ID。</pd>
</plentry>
<plentry>
<pt>roomUuid</pt>
<pd>房间 ID。</pd>
</plentry>
</parml> </section>
</refbody>
</reference>
36 changes: 36 additions & 0 deletions dita/flexible-classroom/edu-context/API/api_onaudiorawdatamixed.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">
<reference id="api_onaudiorawdatamixed">
<title><ph keyref="onAudioRawDataMixed"/></title>
<shortdesc id="short"><ph id="shortdesc">收到远端多路音频流，在将多路音频流合为一路音频流前抛出的音频数据。</ph></shortdesc>
<prolog>
<metadata>
<keywords>
<indexterm keyref="onAudioRawDataMixed"/>
</keywords>
</metadata>
</prolog>
<refbody>
<section id="prototype">
<p outputclass="codeblock">
<codeblock props="android" outputclass="language-kotlin">fun onAudioRawDataMixed(data: FcrAudioRawData)</codeblock>
<codeblock props="ios mac" outputclass="language-swift">FrcAudioRawData onAudioRawDataMixed(FrcAudioRawData data)</codeblock>
<codeblock props="windows" outputclass="language-cpp"/>
<codeblock props="web" outputclass="language-typescript"/>
</p>
</section>
<section id="detailed-desc"><note>SDK 只能抛出单声道数据，采样率可通过 <xref keyref="setAudioRawDataConfig"/> 控制。</note></section>
<section id="parameters"><title>参数</title>
<parml>
<plentry>
<pt>data</pt>
<pd>音频数据，详见 <xref keyref="FcrAudioRawData"/>。</pd>
</plentry>
</parml>
</section>
<section id="return_values">
<title>返回值</title>
<p>音频数据，详见 <xref keyref="FcrAudioRawData"/>。</p>
</section>
</refbody>
</reference>
10 changes: 9 additions & 1 deletion dita/flexible-classroom/edu-context/API/enum_audiorawdataposition.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@
<parml>
<plentry>
<pt>record</pt>
<pd>录制后</pd>
<pd><codeph>2</codeph>：录制后</pd>
</plentry>
<plentry>
<pt>beforeMixed</pt>
<pd><codeph>8</codeph>：多条远端音频流被混合成一路音频流前</pd>
</plentry>
<plentry>
<pt>mixed</pt>
<pd><codeph>4</codeph>：所有远端与本地音频流都已混合成一路音频流</pd>
</plentry>
</parml>
</section></refbody>
Expand Down
4 changes: 4 additions & 0 deletions dita/flexible-classroom/edu-context/Edu_Context_API_Android.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<topicref keyref="setAudioMixingPosition" toc="no"/>
<topicref keyref="getSnapshot" toc="no"/>
<topicref keyref="addAudioRawDataObserver" toc="no"/>
<topicref keyref="setAudioRawDataConfig" toc="no"/>
<topicref keyref="removeAudioRawDataObserver" toc="no"/>
</topicref>
<topicref keyref="AgoraEduMediaHandler" chunk="to-content">
Expand All @@ -42,6 +43,8 @@
</topicref>
<topicref keyref="FcrAudioRawDataObserver" chunk="to-content">
<topicref keyref="onAudioRawDataRecorded" toc="no"/>
<topicref keyref="onAudioRawDataBeforeMixed" toc="no"/>
<topicref keyref="onAudioRawDataMixed" toc="no"/>
</topicref>
<topicref keyref="AgoraEduMonitorContext" chunk="to-content">
<topicref keyref="uploadLog" toc="no"/>
Expand Down Expand Up @@ -149,6 +152,7 @@
<topicref keyref="AgoraEduContextNetworkQuality" toc="no"/>
<topicref keyref="AgoraEduContextMirrorMode" toc="no"/>
<topicref keyref="AgoraEduContextConnectionState" toc="no"/>
<topicref keyref="FcrAudioRawDataPosition" toc="no"/>
<topicref keyref="FcrRecordingState" toc="no"/>
<topicref keyref="AgoraEduContextRenderConfig" toc="no"/>
<topicref keyref="AgoraEduContextStreamInfo" toc="no"/>
Expand Down
2 changes: 2 additions & 0 deletions dita/flexible-classroom/edu-context/Edu_Context_API_iOS.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
</topicref>
<topicref keyref="FcrAudioRawDataObserver" chunk="to-content">
<topicref keyref="onAudioRawDataRecorded" toc="no"/>
<topicref keyref="onAudioRawDataBeforeMixed" toc="no"/>
<topicref keyref="onAudioRawDataMixed" toc="no"/>
</topicref>
<topicref keyref="AgoraEduMonitorContext" chunk="to-content">
<topicref keyref="uploadLog" toc="no"/>
Expand Down
28 changes: 28 additions & 0 deletions dita/flexible-classroom/edu-context/config/keys-edu-context-api-kotlin.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="setAudioRawDataConfig" href="../API/api_setaudiorawdataconfig.dita">
<topicmeta>
<keywords>
<keyword>setAudioRawDataConfig</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="removeAudioRawDataObserver" href="../API/api_removeaudiorawdataobserver.dita">
<topicmeta>
<keywords>
Expand Down Expand Up @@ -547,6 +554,20 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="onAudioRawDataBeforeMixed" href="../API/api_onaudiorawdatabeforemixed.dita">
<topicmeta>
<keywords>
<keyword>onAudioRawDataBeforeMixed</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="onAudioRawDataMixed" href="../API/api_onaudiorawdatamixed.dita">
<topicmeta>
<keywords>
<keyword>onAudioRawDataMixed</keyword>
</keywords>
</topicmeta>
</keydef>
</topichead>
<topichead navtitle="Monitor Handler">
<keydef keys="onLocalNetworkQualityUpdated" href="../API/api_onlocalnetworkqualityupdated.dita">
Expand Down Expand Up @@ -870,6 +891,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="FcrAudioRawDataPosition" href="../API/enum_audiorawdataposition.dita">
<topicmeta>
<keywords>
<keyword>FcrAudioRawDataPosition</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="FcrAudioRawDataConfig" href="../API/class_audiorawdataconfig.dita">
<topicmeta>
<keywords>
Expand Down
14 changes: 14 additions & 0 deletions dita/flexible-classroom/edu-context/config/keys-edu-context-api-swift.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,20 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="onAudioRawDataBeforeMixed" href="../API/api_onaudiorawdatabeforemixed.dita">
<topicmeta>
<keywords>
<keyword>onAudioRawDataBeforeMixed</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="onAudioRawDataMixed" href="../API/api_onaudiorawdatamixed.dita">
<topicmeta>
<keywords>
<keyword>onAudioRawDataMixed</keyword>
</keywords>
</topicmeta>
</keydef>
</topichead>
<topichead navtitle="Monitor Handler">
<keydef keys="onLocalNetworkQualityUpdated" href="../API/api_onlocalnetworkqualityupdated.dita">
Expand Down
Loading