Skip to content

Commit

Permalink
Merge pull request #3780 from AgoraIO/4.4.0-bugfix-0926
Browse files Browse the repository at this point in the history
4.4.0 bugfix 0926
  • Loading branch information
Cilla-luodan authored Sep 27, 2024
2 parents 71cc995 + 3cbb212 commit 1fd5052
Show file tree
Hide file tree
Showing 23 changed files with 180 additions and 45 deletions.
2 changes: 1 addition & 1 deletion dita/RTC-NG/API/api_imusiccontentcenter_getcaches.dita
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dd>v4.2.0</dd>
</dlentry>
</dl>
<p>调用该方法前,你需要预先分配一定大小的内存空间用来存储缓存音乐资源的信息。</p>
<p>调用该方法前,你需要预先分配一定大小的内存空间用来存储缓存音乐资源的信息。如果你需要设置可缓存的音乐资源数量,可通过 <xref keyref="initialize_IMusicContentCenter"/> 的 <parmname props="framework android cpp">configuration</parmname><parmname props="apple">config</parmname> 来设置。</p>
<p>当你不再需要使用已缓存的音乐资源时,你需要及时释放内存以防止内存泄漏。</p>
</section>
<section id="parameters" props="cpp unreal bp unity cs flutter">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
<codeblock props="flutter" outputclass="language-dart">Future&lt;int> getInternalSongCode(
{required int songCode, required String jsonOption});</codeblock> </p>
</section>
<section id="detailed_desc">
<title>详情</title>
<dl outputclass="since">
<dlentry props="android apple cpp">
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
<dl outputclass="since" props="native">
<dlentry>
<dt>自从</dt>
<dd>v4.2.2</dd>
</dlentry>
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/API/api_imusicontentcenter_preload.dita
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</dl>
<p id="desc1">你可以调用该方法预先加载需要播放的音乐资源。成功调用该方法后,SDK 会触发 <xref keyref="onPreLoadEvent_IMusicContentCenterEventHandler"/> 回调报告预加载音乐资源的事件。</p>
<p id="desc2">在调用该方法来预加载音乐资源之前,你需要调用 <xref keyref="getMusicCollectionByMusicChartId"/> 或 <xref keyref="searchMusic"/> 方法来获取你需要播放的音乐资源,并通过由此触发的 <xref keyref="onMusicCollectionResult"/> 回调获取音乐资源的编号(<parmname>songCode</parmname>)。</p>
<note type="attention" id="note">如需销毁 <xref keyref="IRtcEngine"/> 对象,请在收到 <xref keyref="onPreloadEvent"/> 回调后,再调用 <xref keyref="release"/> 方法。</note>
<note type="attention" id="note">如需销毁 <xref keyref="IRtcEngine"/> 对象,请在收到 <xref keyref="onPreLoadEvent_IMusicContentCenterEventHandler"/> 回调后,再调用 <xref keyref="release"/> 方法。</note>
</section>
<section id="parameters">
<title>参数</title>
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/API/api_irtcengine_destroymediarecorder.dita
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<parml>
<plentry>
<pt>mediaRecorder</pt>
<pd>待销毁的音视频录制对象。</pd>
<pd>待销毁的 <xref keyref="IMediaRecorder" /> 对象。</pd>
</plentry>
</parml> </section>
<section id="return_values" conkeyref="setMediaRecorderObserver/return_values"> </section>
Expand Down
7 changes: 0 additions & 7 deletions dita/RTC-NG/API/api_irtcengine_renewtoken.dita
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@
<title>调用限制</title>
<p>无。</p>
</section>
<section id="related" deliveryTarget="details">
<title>相关回调</title>
<ul><li><xref keyref="onTokenPrivilegeWillExpire"/></li>
<li><xref keyref="onRequestToken"/></li>
<li><xref keyref="onConnectionStateChanged"/></li>
</ul>
</section>
<section id="parameters" deliveryTarget="details">
<title>参数</title>
<parml>
Expand Down
2 changes: 1 addition & 1 deletion dita/RTC-NG/API/api_irtcengineex_leavechannelex.dita
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<note type="attention">
<ul>
<li>该方法是异步操作,调用返回时并没有真正退出频道。</li>
<li>如果你调用了 <xref keyref="leaveChannel"/> 或 <xref keyref="leaveChannel2"/> ,会同时离开 <xref keyref="joinChannel1"/> 或 <xref keyref="joinChannel2"/> 及 <xref keyref="joinChannelEx"/> 加入的频道。</li>
<li>如果你调用了 <xref keyref="leaveChannel"/> 或 <xref keyref="leaveChannel2"/> ,会同时离开 <xref keyref="joinChannel1"/> 或 <xref keyref="joinChannel2"/> 及 <xref keyref="joinChannelEx"/> 加入的频道。</li>
</ul></note>
</section>
<section id="scenario" deliveryTarget="details">
Expand Down
4 changes: 2 additions & 2 deletions dita/RTC-NG/API/api_irtcengineex_leavechannelex2.dita
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<note type="attention">
<ul>
<li>该方法是异步操作,调用返回时并没有真正退出频道。</li>
<li props="native unity cs unreal">如果你调用了 <xref keyref="leaveChannel"/> 或 <xref keyref="leaveChannel2"/> ,会同时离开 <xref keyref="joinChannel1"/> 或 <xref keyref="joinChannel2"/> 及 <xref keyref="joinChannelEx"/> 加入的频道。</li>
<li props="flutter electron rn bp">如果你调用了 <xref keyref="leaveChannel2"/> ,会同时离开 <xref keyref="joinChannel2"/> 及 <xref keyref="joinChannelEx"/> 加入的频道。</li>
<li props="native unity cs unreal">如果你调用了 <xref keyref="leaveChannel"/> 或 <xref keyref="leaveChannel2"/> ,会同时离开 <xref keyref="joinChannel1"/> 或 <xref keyref="joinChannel2"/> 及 <xref keyref="joinChannelEx"/> 加入的频道。</li>
<li props="flutter electron rn bp">如果你调用了 <xref keyref="leaveChannel2"/> ,会同时离开 <xref keyref="joinChannel2"/> 及 <xref keyref="joinChannelEx"/> 加入的频道。</li>
</ul></note>
</section>
<section id="scenario" deliveryTarget="details" conkeyref="leaveChannelEx/scenario">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@
<dd>v4.1.0</dd>
</dlentry>
</dl>
<p>当你调用 <xref keyref="preload"/> 方法预加载音乐资源后,SDK 会触发该回调。</p>
<p props="hmos electron flutter rn">当你调用 <xref keyref="preload2"/> 方法预加载音乐资源后,SDK 会触发该回调。</p>
<p props="android ios cpp unity bp unreal">当你调用 <xref keyref="preload"/> 或 <xref keyref="preload2"/> 方法预加载音乐资源后,SDK 会触发该回调。</p>
</section>
<section id="parameters">
<title>参数</title>
<parml>
<plentry props="android ios cpp flutter unity rn" conkeyref="onMusicChartsResult/id">
<plentry props="android ios cpp flutter unity rn unreal" conkeyref="onMusicChartsResult/id">
<pt></pt>
<pd></pd>
</plentry>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ NS_SWIFT_NAME(rtcEngine(_:didClientRoleChanged:newRole:newRoleOptions:));</codeb
ClientRoleOptions newRoleOptions)? onClientRoleChanged;</codeblock>
<codeblock props="reserve" outputclass="language-cpp"></codeblock></p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
</section>
<section id="timing" deliveryTarget="details">
<title>触发时机</title>
<p props="native cs unity unreal">在以下任意一种情况时,会触发此回调:<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
onRejoinChannelSuccess;</codeblock>
<codeblock props="reserve" outputclass="language-cpp"></codeblock></p>
</section>
<section id="detailed_desc" deliveryTarget="details" otherprops="no-title">
</section>
<section id="timing" deliveryTarget="details">
<title>触发时机</title>
<p id="desc">有时候由于网络原因,客户端可能会和服务器失去连接,SDK 会进行自动重连,自动重连成功后触发此回调方法。</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<parml>
<plentry>
<pt>sourceType</pt>
<pd>视频源类型,可能的视频源包括:摄像头、屏幕或媒体播放器。详见 <xref keyref="VIDEO_SOURCE_TYPE"/> 。</pd>
<pd>视频源类型,可能的视频源包括:摄像头、屏幕或媒体播放器。详见 <xref keyref="VIDEO_SOURCE_TYPE"/>。</pd>
</plentry>
<plentry id="videoframe">
<pt>videoFrame</pt>
Expand Down
8 changes: 4 additions & 4 deletions dita/RTC-NG/API/class_lastmileproberesult.dita
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ public:
<pt>state</pt>
<pd>
<p props="ios mac cpp unreal bp unity electron rn flutter cs">Last mile 质量探测结果的状态。详见: <xref keyref="LASTMILE_PROBE_RESULT_STATE" /> 。</p>
<p props="android hmos">Last-mile 质量探测结果的状态,有如下几种:
<p props="android hmos">Last mile 质量探测结果的状态,有如下几种:


<ul>
<li><ph keyref="LASTMILE_PROBE_RESULT_COMPLETE" /> (1):表示本次 Last-mile 质量探测是完整的。</li>
<li><ph keyref="LASTMILE_PROBE_RESULT_INCOMPLETE_NO_BWE" /> (2):表示本次 Last-mile 质量探测未进行带宽预测,因此结果不完整。一个可能的原因是测试资源暂时受限。</li>
<li><ph keyref="LASTMILE_PROBE_RESULT_UNAVAILABLE" /> (3):未进行 Last-mile 质量探测。一个可能的原因是网络连接中断。</li>
<li><ph keyref="LASTMILE_PROBE_RESULT_COMPLETE" /> (1):表示本次 Last mile 质量探测是完整的。</li>
<li><ph keyref="LASTMILE_PROBE_RESULT_INCOMPLETE_NO_BWE" /> (2):表示本次 Last mile 质量探测未进行带宽预测,因此结果不完整。一个可能的原因是测试资源暂时受限。</li>
<li><ph keyref="LASTMILE_PROBE_RESULT_UNAVAILABLE" /> (3):未进行 Last mile 质量探测。一个可能的原因是网络连接中断。</li>
</ul> </p>
</pd>
</plentry>
Expand Down
Loading

0 comments on commit 1fd5052

Please sign in to comment.