From ece213c3522b18a452dfecd10c8d2324b40f28e3 Mon Sep 17 00:00:00 2001 From: Cilla-luodan Date: Wed, 20 Sep 2023 10:48:09 +0800 Subject: [PATCH 1/9] fix keyword --- dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 2 +- dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap | 2 +- en-US/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap | 2 +- en-US/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap index 02ec42580dd..1fccc1db58e 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-ios.ditamap @@ -3465,7 +3465,7 @@ - connectionChangedToState + connectionStateChanged diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap index ad410a1f947..7dd0b0fd181 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-macos.ditamap @@ -3231,7 +3231,7 @@ - connectionChangedToState + connectionStateChanged 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 index c2210a3eeb2..36ee4e54c6c 100644 --- 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 @@ - connectionChangedToState + connectionStateChanged 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 index 1b733f223e0..ee854b7f245 100644 --- 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 @@ - connectionChangedToState + connectionStateChanged From 00b34852e53740c0abaacd046ee68ae06771e26a Mon Sep 17 00:00:00 2001 From: Cilla-luodan Date: Wed, 20 Sep 2023 10:48:17 +0800 Subject: [PATCH 2/9] NMS-10263 --- dita/RTC-NG/API/class_screencaptureparameters.dita | 1 + 1 file changed, 1 insertion(+) diff --git a/dita/RTC-NG/API/class_screencaptureparameters.dita b/dita/RTC-NG/API/class_screencaptureparameters.dita index aded6de0715..fcd2c60dc70 100644 --- a/dita/RTC-NG/API/class_screencaptureparameters.dita +++ b/dita/RTC-NG/API/class_screencaptureparameters.dita @@ -258,6 +258,7 @@
  • :（默认）采集鼠标。
  • : 不采集鼠标。

    • + 受 macOS 系统限制，在共享屏幕时将该参数设置为 无效（共享窗口时无影响）。 From 3f61655e2e4043da11497820f14dd8228c454c56 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 20 Sep 2023 14:06:13 +0800 Subject: [PATCH 3/9] bugfix --- dita/RTC-NG/API/class_channelmediaoptions.dita | 4 +++- dita/RTC-NG/API/enum_networktype.dita | 2 +- dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/class_channelmediaoptions.dita b/dita/RTC-NG/API/class_channelmediaoptions.dita index 34744ca6f45..89bb7951ae2 100644 --- a/dita/RTC-NG/API/class_channelmediaoptions.dita +++ b/dita/RTC-NG/API/class_channelmediaoptions.dita @@ -502,7 +502,9 @@ class ChannelMediaOptions {
    • 自 v4.0.0 起，该参数名称由 publishAudioTrack 改为 publishMicrophoneTrack。
    • 自 v6.0.0 起，该参数名称由 publishAudioTrack 改为 publishMicrophoneTrack。
      • -
    • 如果你想要发布麦克风采集到的音频流，请确保 enableAudioRecordingOrPlayout 设为 。
     +
  • 如果你将该参数设为 ，SDK 也会关闭麦克风采集。
    • +
  • 如果你想要发布麦克风采集到的音频流，请确保 enableAudioRecordingOrPlayout 设为 。
    • +     diff --git a/dita/RTC-NG/API/enum_networktype.dita b/dita/RTC-NG/API/enum_networktype.dita index 9d91d90265d..358d528bb70 100644 --- a/dita/RTC-NG/API/enum_networktype.dita +++ b/dita/RTC-NG/API/enum_networktype.dita @@ -35,7 +35,7 @@ 5: 网络类型为 4G 移动网络。 - + 6: 网络类型为 5G 移动网络。 diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap index 240c3b85ac2..7f061441f3b 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-unity.ditamap @@ -9691,6 +9691,13 @@ + + + + NETWORK_TYPE_MOBILE_5G + + + From 361a9054014ea3b2ba06ee4bd3ecc7c778f72e6d Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 20 Sep 2023 14:15:07 +0800 Subject: [PATCH 4/9] NETWORK_TYPE_MOBILE_5G --- dita/RTC-NG/API/enum_networktype.dita | 4 ++-- dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/enum_networktype.dita b/dita/RTC-NG/API/enum_networktype.dita index 9d91d90265d..55920c21e60 100644 --- a/dita/RTC-NG/API/enum_networktype.dita +++ b/dita/RTC-NG/API/enum_networktype.dita @@ -21,7 +21,7 @@ - 2: 网络类型为 Wi-Fi (包含热点）。 + 2: 网络类型为 Wi-Fi（包含热点）。 @@ -35,7 +35,7 @@ 5: 网络类型为 4G 移动网络。 - + 6: 网络类型为 5G 移动网络。 diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap index 7ba73addf20..62e5d84b912 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-flutter.ditamap @@ -9210,6 +9210,13 @@ + + + + networkTypeMobile5g + + + From dfd27a5378d9901574c46318fd812e7e0e30a823 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 20 Sep 2023 14:19:53 +0800 Subject: [PATCH 5/9] fix cs comments --- dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita b/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita index 93254aa3690..332f9f965ce 100644 --- a/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita +++ b/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita @@ -24,7 +24,7 @@
    详情 - 你需要在 后调用该方法。
    + 请在 后并收到 回调报告播放状态为 后再调用调用该方法。
    参数 @@ -41,4 +41,4 @@
  • < 0: 方法调用失败，详见 。
    • - \ No newline at end of file + From ff69a33f6691b196e4d7ff28763184222ecc9290 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 20 Sep 2023 14:31:35 +0800 Subject: [PATCH 6/9] Update enum_networktype.dita --- dita/RTC-NG/API/enum_networktype.dita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dita/RTC-NG/API/enum_networktype.dita b/dita/RTC-NG/API/enum_networktype.dita index 55920c21e60..5e822c48944 100644 --- a/dita/RTC-NG/API/enum_networktype.dita +++ b/dita/RTC-NG/API/enum_networktype.dita @@ -35,7 +35,7 @@ 5: 网络类型为 4G 移动网络。     - + 6: 网络类型为 5G 移动网络。 From e439398c5fe89a4e594c43a6c0b9ca54c6eca0c1 Mon Sep 17 00:00:00 2001 From: Suri539 Date: Wed, 20 Sep 2023 14:31:55 +0800 Subject: [PATCH 7/9] Update keys-rtc-ng-api-rn.ditamap --- dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap index 46ac8fcba22..b0c8dad6105 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-rn.ditamap @@ -9158,6 +9158,13 @@ + + + + NetworkTypeMobile5g + + + @@ -11944,4 +11951,4 @@ - \ No newline at end of file + From 6b48c4131dac81394ca8b77b475208fd32166d3d Mon Sep 17 00:00:00 2001 From: jinyu Date: Thu, 21 Sep 2023 10:33:02 +0800 Subject: [PATCH 8/9] Update keys-rtc-ng-api-cpp.ditamap --- dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap index fded8f14972..e3fefff3f5c 100644 --- a/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap +++ b/dita/RTC-NG/config/keys-rtc-ng-api-cpp.ditamap @@ -11828,7 +11828,7 @@ - VideoContentHint + VIDEO_CONTENT_HINT From f32dea4ea2bc7d5231ba12374ad86d21d641a91e Mon Sep 17 00:00:00 2001 From: Suri539 Date: Thu, 21 Sep 2023 10:39:15 +0800 Subject: [PATCH 9/9] Update api_imediaplayer_getstreamcount.dita --- dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita b/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita index 332f9f965ce..3d8e16bab09 100644 --- a/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita +++ b/dita/RTC-NG/API/api_imediaplayer_getstreamcount.dita @@ -24,7 +24,7 @@
    详情 - 请在 后并收到 回调报告播放状态为 后再调用调用该方法。
    + 请在 后并收到 回调报告播放状态为 后再调用该方法。
    参数