Merge pull request #3340 from AgoraIO/4.2.2-bugfix-0921

4.2.2 bugfix 0921
AgoraIO · Sep 21, 2023 · ecd612e · ecd612e
2 parents 1c439e2 + f32dea4
commit ecd612e
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 11 deletions.
diff --git a/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita b/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita
@@ -24,7 +24,7 @@
         </section>
         <section id="detailed_desc">
             <title>详情</title>
-            <note type="attention" id="note">你需要在 <xref keyref="open" /> 后调用该方法。</note> </section>
+            <note type="attention" id="note">请在 <xref keyref="open"/> 后并收到 <xref keyref="onPlayerSourceStateChanged" /> 回调报告播放状态为 <apiname keyref="PLAYER_STATE_OPEN_COMPLETED" /> 后再调用该方法。</note> </section>
         <section id="parameters" props="cpp unreal bp unity cs">
             <title>参数</title>
             <parml>
@@ -41,4 +41,4 @@
             <li>&lt; 0: 方法调用失败，详见 <xref keyref="MEDIA_PLAYER_ERROR" />。</li>
             </ul> </section>
     </refbody>
-</reference>
+</reference>
diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita
@@ -502,7 +502,9 @@ class ChannelMediaOptions {
                     <note type="note">
                     <ul><li props="native unity rn electron">自 v4.0.0 起，该参数名称由 <parmname>publishAudioTrack</parmname> 改为 <parmname>publishMicrophoneTrack</parmname>。</li>
                     <li props="flutter">自 v6.0.0 起，该参数名称由 <parmname>publishAudioTrack</parmname> 改为 <parmname>publishMicrophoneTrack</parmname>。</li>
-                    <li>如果你想要发布麦克风采集到的音频流，请确保 <parmname>enableAudioRecordingOrPlayout</parmname> 设为 <codeph><ph keyref="true"/></codeph>。</li></ul></note>
+                    <li>如果你将该参数设为 <codeph><ph keyref="false"/></codeph>，SDK 也会关闭麦克风采集。</li>
+                        <li>如果你想要发布麦克风采集到的音频流，请确保 <parmname>enableAudioRecordingOrPlayout</parmname> 设为 <codeph><ph keyref="true"/></codeph>。</li>
+                    </ul></note>
                 </pd>
             </plentry>
             <plentry props="cpp mac unity cs flutter electron">

diff --git a/dita/RTC-NG/API/class_screencaptureparameters.dita b/dita/RTC-NG/API/class_screencaptureparameters.dita
@@ -258,6 +258,7 @@
                     <li><codeph><ph keyref="true"/></codeph>:（默认）采集鼠标。</li>
                     <li><codeph><ph keyref="false"/></codeph>: 不采集鼠标。</li>
                     </ul></p>
+                    <note props="cpp mac unity flutter electron">受 macOS 系统限制，在共享屏幕时将该参数设置为 <codeph><ph keyref="false"/></codeph> 无效（共享窗口时无影响）。</note>
                 </pd>
             </plentry>
             <plentry props="mac cpp unreal bp unity electron rn flutter cs">

diff --git a/dita/RTC-NG/API/enum_networktype.dita b/dita/RTC-NG/API/enum_networktype.dita
@@ -21,7 +21,7 @@
        </plentry>
        <plentry>
   <pt><ph keyref="NETWORK_TYPE_WIFI"/></pt>
-  <pd>2: 网络类型为 Wi-Fi (包含热点）。</pd>
+  <pd>2: 网络类型为 Wi-Fi（包含热点）。</pd>
        </plentry>
        <plentry>
   <pt><ph keyref="NETWORK_TYPE_MOBILE_2G"/></pt>
@@ -35,7 +35,7 @@
   <pt><ph keyref="NETWORK_TYPE_MOBILE_4G"/></pt>
   <pd>5: 网络类型为 4G 移动网络。</pd>
        </plentry>
-       <plentry props="native unreal bp">
+       <plentry props="native rn flutter unreal bp cs unity">
           <pt><ph keyref="NETWORK_TYPE_MOBILE_5G"/></pt>
           <pd>6: 网络类型为 5G 移动网络。</pd>
        </plentry>

diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap
@@ -11821,7 +11821,7 @@
         <keydef keys="VIDEO_CONTENT_HINT" href="../API/enum_videocontenthint.dita">
             <topicmeta>
                 <keywords>
-                    <keyword>VideoContentHint</keyword>
+                    <keyword>VIDEO_CONTENT_HINT</keyword>
                 </keywords>
             </topicmeta>
         </keydef>

diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap
@@ -9203,6 +9203,13 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="NETWORK_TYPE_MOBILE_5G">
+            <topicmeta>
+                <keywords>
+                    <keyword>networkTypeMobile5g</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="ORIENTATION_MODE" href="../API/enum_orientationmode.dita">
             <topicmeta>
                 <keywords>

diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap
@@ -3479,7 +3479,7 @@
             <keydef keys="onConnectionStateChanged" href="../API/callback_irtcengineeventhandler_onconnectionstatechanged.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>connectionChangedToState</keyword>
+                        <keyword>connectionStateChanged</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>

diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap
@@ -3245,7 +3245,7 @@
             <keydef keys="onConnectionStateChanged" href="../API/callback_irtcengineeventhandler_onconnectionstatechanged.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>connectionChangedToState</keyword>
+                        <keyword>connectionStateChanged</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>

diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap
@@ -9151,6 +9151,13 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="NETWORK_TYPE_MOBILE_5G">
+            <topicmeta>
+                <keywords>
+                    <keyword>NetworkTypeMobile5g</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="ORIENTATION_MODE" href="../API/enum_orientationmode.dita">
             <topicmeta>
                 <keywords>
@@ -11937,4 +11944,4 @@
                     </topicmeta>
                 </keydef>
     </topichead>
-</map>
+</map>
diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap
@@ -9670,6 +9670,13 @@
                 </keywords>
             </topicmeta>
         </keydef>
+        <keydef keys="NETWORK_TYPE_MOBILE_5G">
+            <topicmeta>
+                <keywords>
+                    <keyword>NETWORK_TYPE_MOBILE_5G</keyword>
+                </keywords>
+            </topicmeta>
+        </keydef>
         <keydef keys="OBSERVER_MODE" href="../API/enum_observermode.dita">
             <topicmeta>
                 <keywords>

diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap
@@ -3465,7 +3465,7 @@
             <keydef keys="onConnectionStateChanged" href="../API/callback_irtcengineeventhandler_onconnectionstatechanged.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>connectionChangedToState</keyword>
+                        <keyword>connectionStateChanged</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>

diff --git a/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap
@@ -3231,7 +3231,7 @@
             <keydef keys="onConnectionStateChanged" href="../API/callback_irtcengineeventhandler_onconnectionstatechanged.dita">
                 <topicmeta>
                     <keywords>
-                        <keyword>connectionChangedToState</keyword>
+                        <keyword>connectionStateChanged</keyword>
                     </keywords>
                 </topicmeta>
             </keydef>