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

[AUTO: DELETE THIS BRANCH ONCE YOU MERGE！！！] Sync cn prototype to en prototype in a flash #3798

Merged
merged 1 commit into from
Oct 25, 2024
Merged

[AUTO: DELETE THIS BRANCH ONCE YOU MERGE！！！] Sync cn prototype to en prototype in a flash #3798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions en-US/dita/RTC-NG/API/class_channelmediaoptions.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@
public audioDelayMs?:number;

public mediaPlayerAudioDelayMs?:number;

public token?:string;

public enableBuiltInMediaEncryption?:boolean;

Expand Down
2 changes: 1 addition & 1 deletion en-US/dita/RTC-NG/API/class_musiccontentcenterconfiguration.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

public eventHandler?:IMusicContentCenterEventHandler

public mccDomain:string = ""
public mccDomain?:string
}</codeblock>
<codeblock props="ios mac" outputclass="language-objectivec">__attribute__((visibility("default"))) @interface AgoraMusicContentCenterConfig : NSObject
@property(assign, nonatomic) AgoraRtcEngineKit* _Nullable rtcEngine;
Expand Down
138 changes: 76 additions & 62 deletions en-US/dita/RTC-NG/config/keys-rtc-ng-api-harmony.ditamap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="IMediaPlayerCacheManager" href="../API/class_imediaplayercachemanager.dita">
<keydef keys="IMediaPlayerCacheManager" href="../API/class_imediaplayercachemanager.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>IMediaPlayerCacheManager</keyword>
Expand Down Expand Up @@ -443,7 +443,7 @@
<keydef keys="getPlaySrc" href="../API/api_imusicplayer_getplaysrc.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>getPlaySrc</keyword>
<keyword>getPlaySrc [2/2]</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down Expand Up @@ -834,13 +834,6 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="enableAudioQualityIndication" href="../API/api_irtcengine_enableaudioqualityindication.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>enableAudioQualityIndication</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="disableAudio" href="../API/api_irtcengine_disableaudio.dita">
<topicmeta>
<keywords>
Expand Down Expand Up @@ -1032,20 +1025,6 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="CreateRendererView" href="../API/api_irtcengine_createrendererview.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>CreateRendererView</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="CreateTextureView" href="../API/api_irtcengine_createtextureview.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>CreateTextureView</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="startPreview" href="../API/api_irtcengine_startpreview.dita"/>
<keydef keys="startPreview2" href="../API/api_irtcengine_startpreview2.dita">
<topicmeta>
Expand Down Expand Up @@ -2484,24 +2463,10 @@
</keydef>
</topichead>
<topichead navtitle="通话前网络测试">
<keydef keys="startEchoTest1" href="../API/api_irtcengine_startechotest.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>startEchoTest [1/3]</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="startEchoTest2" href="../API/api_irtcengine_startechotest2.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>startEchoTest [2/3]</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="startEchoTest3" href="../API/api_irtcengine_startechotest3.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>startEchoTest [3/3]</keyword>
<keyword>startEchoTest</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down Expand Up @@ -2819,31 +2784,31 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="onExtensionEvent" href="../API/callback_irtcengineeventhandler_onextensionevent.dita" props="reserve">
<keydef keys="onExtensionEventWithContext" href="../API/callback_irtcengineeventhandler_onextensioneventwithcontext.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>onEvent</keyword>
<keyword>onEventWithContext</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="onExtensionStarted" href="../API/callback_irtcengineeventhandler_onextensionstarted.dita" props="reserve">
<keydef keys="onExtensionStartedWithContext" href="../API/callback_irtcengineeventhandler_onextensionstartedwithcontext.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>onStarted</keyword>
<keyword>onStartedWithContext</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="onExtensionStopped" href="../API/callback_irtcengineeventhandler_onextensionstopped.dita" props="reserve">
<keydef keys="onExtensionStoppedWithContext" href="../API/callback_irtcengineeventhandler_onextensionstoppedwithcontext.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>onStopped</keyword>
<keyword>onStoppedWithContext</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="onExtensionError" href="../API/callback_irtcengineeventhandler_onextensionerror.dita">
<keydef keys="onExtensionErrorWithContext" href="../API/callback_irtcengineeventhandler_onextensionerrorwithcontext.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>onError</keyword>
<keyword>onErrorWithContext</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down Expand Up @@ -3233,6 +3198,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="stop_IMusicPlayer" href="../API/api_imusicplayer_stop.dita" props="reserve">
<topicmeta>
<keywords>
<keyword>stop [2/2]</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="preload" href="../API/api_imusicontentcenter_preload.dita">
<topicmeta>
<keywords>
Expand Down Expand Up @@ -3303,6 +3275,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="destroyMusicPlayer" href="../API/api_imusiccontentcenter_destroymusicplayer.dita">
<topicmeta>
<keywords>
<keyword>destroyMusicPlayer</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="getLyric" href="../API/api_imusiccontentcenter_getlyric.dita">
<topicmeta>
<keywords>
Expand Down Expand Up @@ -3373,6 +3352,13 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="setPlayMode" href="../API/api_imusicplayer_setplaymode.dita">
<topicmeta>
<keywords>
<keyword>setPlayMode</keyword>
</keywords>
</topicmeta>
</keydef>
</topichead>
<topichead navtitle="音乐内容中心事件">
<keydef keys="onPreLoadEvent_IMusicContentCenterEventHandler" href="../API/callback_imusiccontentcentereventhandler_onpreloadevent.dita">
Expand Down Expand Up @@ -8983,105 +8969,105 @@
<keydef keys="PLAYER_EVENT_UNKNOWN">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_UNKNOWN</keyword>
<keyword>UNKNOWN</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_SEEK_BEGIN">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_SEEK_BEGIN</keyword>
<keyword>SEEK_BEGIN</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_SEEK_COMPLETE">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_SEEK_COMPLETE</keyword>
<keyword>SEEK_COMPLETE</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_SEEK_ERROR">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_SEEK_ERROR</keyword>
<keyword>SEEK_ERROR</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_AUDIO_TRACK_CHANGED">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_AUDIO_TRACK_CHANGED</keyword>
<keyword>AUDIO_TRACK_CHANGED</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_BUFFER_LOW">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_BUFFER_LOW</keyword>
<keyword>BUFFER_LOW</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_BUFFER_RECOVER">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_BUFFER_RECOVER</keyword>
<keyword>BUFFER_RECOVER</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_FREEZE_START">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_FREEZE_START</keyword>
<keyword>FREEZE_START</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_FREEZE_STOP">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_FREEZE_STOP</keyword>
<keyword>FREEZE_STOP</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_SWITCH_BEGIN">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_SWITCH_BEGIN</keyword>
<keyword>SWITCH_BEGIN</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_SWITCH_COMPLETE">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_SWITCH_COMPLETE</keyword>
<keyword>SWITCH_COMPLETE</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_SWITCH_ERROR">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_SWITCH_ERROR</keyword>
<keyword>SWITCH_ERROR</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_FIRST_DISPLAYED">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_FIRST_DISPLAYED</keyword>
<keyword>FIRST_DISPLAYED</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_REACH_CACHE_FILE_MAX_COUNT">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_REACH_CACHE_FILE_MAX_COUNT</keyword>
<keyword>REACH_CACHE_FILE_MAX_COUNT</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PLAYER_EVENT_REACH_CACHE_FILE_MAX_SIZE">
<topicmeta>
<keywords>
<keyword>PLAYER_EVENT_REACH_CACHE_FILE_MAX_SIZE</keyword>
<keyword>REACH_CACHE_FILE_MAX_SIZE</keyword>
</keywords>
</topicmeta>
</keydef>
Expand Down Expand Up @@ -9428,7 +9414,35 @@
</keywords>
</topicmeta>
</keydef>
<keydef keys="PreloadState" href="../API/enum_preloadstate.dita" props="cn">
<keydef keys="MusicPlayMode" href="../API/enum_musicplaymode.dita" props="cn">
<topicmeta>
<keywords>
<keyword>MusicPlayMode</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="kMusicPlayModeOriginal">
<topicmeta>
<keywords>
<keyword>ORIGINAL</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="kMusicPlayModeAccompany">
<topicmeta>
<keywords>
<keyword>ACCOMPANY</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="kMusicPlayModeLeadSing">
<topicmeta>
<keywords>
<keyword>LEAD_SING</keyword>
</keywords>
</topicmeta>
</keydef>
<keydef keys="PreloadState" href="../API/enum_preloadstate.dita" props="cn">
<topicmeta>
<keywords>
<keyword>PreloadState</keyword>
Expand Down
Loading