Merge branch 'master' into translation/4.x-api-ref

AgoraIO · Sep 28, 2023 · 2fd2601 · 2fd2601
2 parents 2c4ed90 + b20e291
commit 2fd2601
Show file tree

Hide file tree

Showing 363 changed files with 2,520 additions and 2,629 deletions.
diff --git a/dita/RTC-NG/API/api_irtcengine_getscreencapturesources.dita b/dita/RTC-NG/API/api_irtcengine_getscreencapturesources.dita
@@ -44,7 +44,7 @@
             <parml>
             <plentry>
                 <pt>thumbSize</pt>
-                <pd><ph>屏幕或窗口的缩略图的目标尺寸（宽高单位为像素）。</ph><ph props="cpp unreal bp">详见 <xref keyref="SIZE-link" />。</ph><ph> SDK 会在保证原图不变形的前提下，缩放原图，使图片最长边和目标尺寸的最长边的长度一致。例如，原图宽高为 400 × 300，<parmname>thumbSize</parmname> 为 100 x 100，缩略图实际尺寸为 100 × 75。如果目标尺寸大于原图尺寸，缩略图即为原图，SDK 不进行缩放操作。</ph></pd>
+                <pd><ph>屏幕或窗口的缩略图的目标尺寸（宽高单位为像素）。</ph><ph props="cpp unreal bp">详见 <xref keyref="SIZE-link" />。</ph><ph>SDK 会在保证原图不变形的前提下，缩放原图，使图片最长边和目标尺寸的最长边的长度一致。例如，原图宽高为 400 × 300，<parmname>thumbSize</parmname> 为 100 x 100，缩略图实际尺寸为 100 × 75。如果目标尺寸大于原图尺寸，缩略图即为原图，SDK 不进行缩放操作。</ph></pd>
             </plentry>
             <plentry>
                 <pt>iconSize</pt>

diff --git a/dita/RTC-NG/API/api_irtcengine_muteallremoteaudiostreams.dita b/dita/RTC-NG/API/api_irtcengine_muteallremoteaudiostreams.dita
@@ -29,7 +29,7 @@
             <ul>
             <li>该方法需要在加入频道后调用。</li>
             <li>如果需要在加入频道前设置默认不订阅远端用户音频流，可以在调用 <xref keyref="joinChannel2"/> 加入频道时设置 <parmname>autoSubscribeAudio</parmname> 为 <codeph><ph keyref="false"/></codeph>。</li>
-            <li props="ios android cpp unreal bp"><ph>该方法的推荐设置详见<xref keyref="guide-set-subscribing-state">设置订阅状态</xref>。</ph></li>
+            <li props="hide"><ph>该方法的推荐设置详见<xref keyref="guide-set-subscribing-state">设置订阅状态</xref>。</ph></li>
             </ul> </note> </section>
         <section id="parameters">
             <title>参数</title>

diff --git a/dita/RTC-NG/API/api_irtcengineex_muteallremoteaudiostreamsex.dita b/dita/RTC-NG/API/api_irtcengineex_muteallremoteaudiostreamsex.dita
@@ -37,7 +37,7 @@
             <ul>
             <li>该方法需要在加入频道后调用。</li>
             <li>如果需要在加入频道前设置默认不订阅远端用户音频流，可以在调用 <xref keyref="joinChannel2"/> 加入频道时设置 <parmname>autoSubscribeAudio</parmname> 为 <codeph><ph keyref="false"/></codeph>。</li>
-            <li props="ios android cpp unreal bp"><ph>该方法的推荐设置详见<xref keyref="guide-set-subscribing-state">设置订阅状态</xref>。</ph></li>
+            <li props="hide"><ph>该方法的推荐设置详见<xref keyref="guide-set-subscribing-state">设置订阅状态</xref>。</ph></li>
             </ul> </note> </section>
         <section id="parameters">
             <title>参数</title>

diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita
@@ -724,7 +724,7 @@ class ChannelMediaOptions {
             <plentry>
                 <pt>token</pt>
                 <pd>
-                    <p>（可选）在服务端生成的用于鉴权的动态密钥。详见<xref keyref="guide-token" props="native unreal bp">使用 Token 鉴权</xref>。</p>
+                    <p>（可选）在服务端生成的用于鉴权的动态密钥。详见<xref keyref="guide-token"/>。</p>
                     <note type="caution">
                     <ul>
                     <li>该参数仅在调用 <xref keyref="updateChannelMediaOptions"/> 或 <xref keyref="updateChannelMediaOptionsEx"/> 时生效。</li>

diff --git a/dita/RTC-NG/API/class_livetranscoding.dita b/dita/RTC-NG/API/class_livetranscoding.dita
@@ -599,7 +599,7 @@
         <pt>videoBitrate</pt>
         <pd>
           <p>用于旁路直播的输出视频的码率。单位为 Kbps。400 Kbps 为默认值。</p>
-          <p props="native unreal bp">你可以根据<xref keyref="video-profile-table">视频属性</xref>参考表中的码率值进行设置；如果设置的码率超出合理范围，声网服务器会在合理区间内自动调整码率值。</p>
+          <p>你可以根据<xref keyref="video-profile-table"/>参考表中的码率值进行设置；如果设置的码率超出合理范围，声网服务器会在合理区间内自动调整码率值。</p>
         </pd>
       </plentry>
       <plentry>

diff --git a/dita/RTC-NG/API/enum_audioprocessingchannels.dita b/dita/RTC-NG/API/enum_audioprocessingchannels.dita
@@ -16,8 +16,8 @@
             </ol></p>
             <note type="attention">
             <ul>
-            <li>立体声设置仅在媒体音量下生效。<ph props="android ios">详见<xref keyref="volume-type"/>。</ph><ph props="cpp unreal bp unity">详见<xref keyref="volume-type-android"/>和<xref keyref="volume-type-ios"/>。</ph></li>
-            <li props="cpp unreal bp ios rn unity">在 iOS 上，立体声对设备性能要求较高。仅支持在 iOS 14.0 及以上版本的如下设备中实现立体声：
+            <li>立体声设置仅在媒体音量下生效。<ph props="android ios">详见<xref keyref="volume-type"/>。</ph><ph props="cpp unreal bp unity flutter rn">详见<xref keyref="volume-type-android"/>和<xref keyref="volume-type-ios"/>。</ph></li>
+            <li props="cpp unreal bp ios rn unity flutter">在 iOS 上，立体声对设备性能要求较高。仅支持在 iOS 14.0 及以上版本的如下设备中实现立体声：
 
 
                 <ul>

diff --git a/dita/RTC-NG/API/rtc_api_overview.dita b/dita/RTC-NG/API/rtc_api_overview.dita
@@ -904,10 +904,6 @@
                 <stentry><xref keyref="startScreenCaptureByWindowId"/></stentry>
                 <stentry><ph conkeyref="startScreenCaptureByWindowId/shortdesc"/><ph props="cpp unreal bp electron flutter unity">（仅适用于 Windows 和 macOS）</ph></stentry>
             </strow>
-            <strow props="cpp unreal bp unity flutter electron cs">
-                <stentry><xref keyref="startScreenCaptureByScreenRect"/></stentry>
-                <stentry><ph conkeyref="startScreenCaptureByScreenRect/shortdesc"/><ph props="cpp unreal bp unity flutter electron">（仅适用于 Windows）</ph></stentry>
-            </strow>
             <strow props="cpp unreal bp mac electron flutter unity cs">
                 <stentry><xref keyref="startScreenCaptureByDisplayId"/></stentry>
                 <stentry><ph conkeyref="startScreenCaptureByDisplayId/shortdesc"/><ph props="cpp unreal bp unity electron flutter">（仅适用于 Windows 和 macOS）</ph></stentry>

diff --git a/dita/RTC-NG/RTC_NG_API_CPP.ditamap b/dita/RTC-NG/RTC_NG_API_CPP.ditamap
@@ -590,10 +590,8 @@
                 <topicref keyref="setLiveTranscoding" toc="no" processing-role="resource-only"/>
                 <topicref keyref="startRtmpStreamWithoutTranscoding" toc="no"/>
                 <topicref keyref="startRtmpStreamWithoutTranscodingEx" toc="no"/>
-                <topicref keyref="startRtmpStreamWithoutTranscodingEx" toc="no"/>
                 <topicref keyref="startRtmpStreamWithTranscoding" toc="no"/>
                 <topicref keyref="startRtmpStreamWithTranscodingEx" toc="no"/>
-                <topicref keyref="startRtmpStreamWithTranscodingEx" toc="no"/>
                 <topicref keyref="stopRtmpStream" toc="no"/>
                 <topicref keyref="stopRtmpStreamEx" toc="no"/>
                 <topicref keyref="updateRtmpTranscoding" toc="no"/>

diff --git a/dita/RTC-NG/RTC_NG_API_macOS.ditamap b/dita/RTC-NG/RTC_NG_API_macOS.ditamap
@@ -532,10 +532,8 @@
                 <topicref keyref="setLiveTranscoding" toc="no" processing-role="resource-only"/>
                 <topicref keyref="startRtmpStreamWithoutTranscoding" toc="no"/>
                 <topicref keyref="startRtmpStreamWithoutTranscodingEx" toc="no"/>
-                <topicref keyref="startRtmpStreamWithoutTranscodingEx" toc="no"/>
                 <topicref keyref="startRtmpStreamWithTranscoding" toc="no"/>
                 <topicref keyref="startRtmpStreamWithTranscodingEx" toc="no"/>
-                <topicref keyref="startRtmpStreamWithTranscodingEx" toc="no"/>
                 <topicref keyref="stopRtmpStream" toc="no"/>
                 <topicref keyref="stopRtmpStreamEx" toc="no"/>
                 <topicref keyref="updateRtmpTranscoding" toc="no"/>

diff --git a/dita/RTC-NG/config/keys-rtc-ng-links-android.ditamap b/dita/RTC-NG/config/keys-rtc-ng-links-android.ditamap
@@ -3,63 +3,53 @@
 <map id="keys_rtc_windows_links">
     <title>Keys RTC NG Android Links</title>
     <topichead navtitle="Agora">
-        <keydef keys="term-transocding" href="https://docs.agora.io/cn/Agora%20Platform/transcoding" scope="external" format="html"/>
-        <keydef keys="guide-in-call-quality" href="https://docs.agora.io/cn/live-streaming-premium-4.x/in-call_quality_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-multiple-channel" href="https://docs.agora.io/cn/live-streaming-premium-4.x/multiple_channel_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-screensharing" href="https://docs.agora.io/cn/live-streaming-premium-4.x/screensharing_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-fallback" href="https://docs.agora.io/cn/live-streaming-premium-4.x/fallback_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-lastmile-quality" href="https://docs.agora.io/cn/live-streaming-premium-4.x/lastmile_quality_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-cdn-streaming" href="https://docs.agora.io/cn/live-streaming-premium-4.x/cdn_streaming_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-set-subscribing-state" href="https://docs.agora.io/cn/live-streaming-premium-4.x/set_subscribing_state_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-cloud-proxy" href="https://docs.agora.io/cn/live-streaming-premium-4.x/cloudproxy_native_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-set-video-profile" href="https://docs.agora.io/cn/live-streaming-premium-4.x/video_profile_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="faq-sei" href="https://docs.agora.io/cn/faq/sei" scope="external" format="html"/>
-        <keydef keys="guide-audio-route" href="https://docs.agora.io/cn/live-streaming-premium-4.x/audio_route_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="guide-voice-changer" href="https://docs.agora.io/cn/live-streaming-premium-4.x/voice_changer_android_ng?platform=Android" scope="external" format="html"/>
-        <keydef keys="volume-type" href="https://docs.agora.io/cn/live-streaming-premium-4.x/audio_profile_android_ng?platform=Android#volumetype" scope="external" format="html">
+        <keydef keys="guide-audio-route" href="https://doc.shengwang.cn/doc/rtc/android/advanced-features/audio-route" scope="external" format="html"/>
+        <keydef keys="guide-voice-changer" href="https://doc.shengwang.cn/doc/rtc/android/advanced-features/voice-changer" scope="external" format="html"/>
+        <keydef keys="volume-type" href="https://doc.shengwang.cn/doc/rtc/android/basic-features/audio-profile#%E9%9F%B3%E9%87%8F%E7%B1%BB%E5%9E%8B" scope="external" format="html">
             <topicmeta>
                 <keywords>
                     <keyword>音量类型</keyword>
                 </keywords>
             </topicmeta>
         </keydef>
-        <keydef keys="video-profile-table" href="https://docs.agora.io/cn/live-streaming-premium-4.x/video_profile_android_ng?platform=Android#videoprofile" scope="external" format="html">
+        <keydef keys="video-profile-table" href="https://doc.shengwang.cn/doc/rtc/android/basic-features/video-profile#%E8%A7%86%E9%A2%91%E5%B1%9E%E6%80%A7%E5%8F%82%E8%80%83" scope="external" format="html">
             <topicmeta>
                 <keywords>
                     <keyword>视频属性</keyword>
                 </keywords>
             </topicmeta>
         </keydef>
-        <keydef keys="guide-bill" href="https://docs.agora.io/cn/live-streaming-premium-4.x/billing_rtc_ng?platform=Android" scope="external" format="html">
+        <keydef keys="guide-bill" href="https://doc.shengwang.cn/doc/rtc/android/overview/billing" scope="external" format="html">
             <topicmeta>
                 <keywords>
                     <keyword>计费说明</keyword>
                 </keywords>
             </topicmeta>
         </keydef>
-        <keydef keys="guide-token" href="https://docs.agora.io/cn/live-streaming-premium-4.x/token_server_android_ng?platform=Android" scope="external" format="html">
+        <keydef keys="guide-token" href="https://doc.shengwang.cn/doc/rtc/android/basic-features/token-authentication" scope="external" format="html">
             <topicmeta>
                 <keywords>
                     <keyword>使用 Token 鉴权</keyword>
                 </keywords>
             </topicmeta>
-        </keydef>    
-        <keydef keys="enable-content-inspect" href="https://docs.agora.io/cn/content-moderation/content_moderation_enable?platform=All%20Platforms" scope="external" format="html">
+        </keydef>
+        <keydef keys="wildcard-token" href="https://doc.shengwang.cn/doc/rtc/android/best-practice/wildcard-token" scope="external" format="html">
+            <topicmeta>
+                <keywords>
+                    <keyword>使用通配 Token</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
+        <keydef keys="error-code-link" href="https://doc.shengwang.cn/api-ref/rtc/android/error-code" scope="external" format="html">
             <topicmeta>
                 <keywords>
-                    <keyword>开启和配置视频内容审核服务</keyword>
+                    <keyword>错误码</keyword>
                 </keywords>
             </topicmeta>
         </keydef>
     </topichead>
     <topichead navtitle="External">
         <keydef keys="filePath-link" href="https://developer.android.google.cn/guide/topics/media/media-formats?hl=zh-cn" scope="external" format="html"/>
-        <keydef keys="onActivityResult-link" href="https://developer.android.google.cn/reference/android/preference/PreferenceManager.OnActivityResultListener#onActivityResult(int,%20int,%20android.content.Intent)" scope="external" format="html"/>
-        <keydef keys="startForeground-link" href="https://developer.android.google.cn/guide/components/foreground-services?hl=en#start" scope="external" format="html"/>
-        <keydef keys="MediaProjection-link" href="https://developer.android.google.cn/reference/android/media/projection/MediaProjection" scope="external" format="html"/>
-        <keydef keys="SecurityException-link" href="https://developer.android.google.cn/reference/java/lang/SecurityException" scope="external" format="html"/>
-        <keydef keys="TextureVsSurface-links" href="https://source.android.google.cn/devices/graphics/arch-tv#surface_or_texture" scope="external" format="html"/>
-        <keydef keys="SurfaceOrTexutre-links" href="https://github.com/crosswalk-project/crosswalk-website/wiki/Android-SurfaceView-vs-TextureView" scope="external" format="html"/>
         <keydef keys="SurfaceView-link" href="https://developer.android.com/reference/android/view/SurfaceView" scope="external" format="html">
             <topicmeta>
                 <keywords>