diff --git a/et HEAD^ b/et HEAD^ new file mode 100644 index 0000000000000000000000000000000000000000..e2b30ed75fa7deabaf3b6abbe3fd0bcdd3527c18 --- /dev/null +++ b/et HEAD^ @@ -0,0 +1,128 @@ +commit 74e10fd87f320ad4e432d49d429f01033f2cd913 (HEAD -> master, origin/master, origin/HEAD) +Author: guo-chunting +Date: Fri Sep 9 10:50:43 2022 +0800 + + nativesdk + + Signed-off-by: guo-chunting + +commit 9a168b27c7a5623cb1501bde55582b571966e32b +Merge: 1b05fc3 9d41374 +Author: openharmony_sig_ci +Date: Thu Sep 8 11:51:20 2022 +0000 + + !137 修改codec接口注释 + Merge pull request !137 from crescenthe/master + +commit 9d4137429e66c4669310e334ab348c3e6d9217c0 +Author: crescent +Date: Thu Sep 8 09:01:26 2022 +0000 + + modify codec api note + + Signed-off-by: crescent + +commit 1b05fc35a2db1554efb6e5771fddf2be79ca757b +Merge: 106d4fd e76ae47 +Author: Robert +Date: Thu Sep 8 07:10:50 2022 +0000 + + !118 增加Audio HDI接口IDL化后HDI接口说明 + Merge pull request !118 from vb6174/feat-add_audio_idl_zh + +commit 106d4fdffc0b8df58a920b513518afc948dbb325 +Merge: 107595a 0f7241c +Author: openharmony_sig_ci +Date: Thu Sep 8 06:12:48 2022 +0000 + + !135 docs: Add IDL files of light, vibrator and sensor modules + Merge pull request !135 from chenchong_666/master + +commit 0f7241c34d9832fdd4f5bbff70f97aa2626ffcb3 +Author: chenchong_666 +Date: Thu Sep 8 11:28:13 2022 +0800 + + docs: Add IDL files of light, vibrator and sensor modules + + Signed-off-by: chenchong_666 + +commit 107595a0a60eae4d430d82ff532eb7dae8b0fe49 +Merge: 8ab2ed6 96cab76 +Author: openharmony_sig_ci +Date: Tue Sep 6 06:08:11 2022 +0000 + + !134 nativeSdk 资料 + Merge pull request !134 from 郭春婷/master + +commit 96cab76d1b0b4979681212450dba9e29aea15608 +Author: guo-chunting +Date: Tue Sep 6 11:07:18 2022 +0800 + + nativeSDK + + Signed-off-by: guo-chunting + +commit 8ab2ed6d791484824e054bfd831e7be4685fbec0 +Merge: a0e4586 1bcb28f +Author: openharmony_sig_ci +Date: Tue Sep 6 02:39:13 2022 +0000 + + !123 翻译已完成 + Merge pull request !123 from shawn_he/master + +commit a0e458636c8542ebdb6393c02a5fdc625f06ba89 +Merge: 31832bf 840ff0b +Author: openharmony_sig_ci +Date: Tue Sep 6 01:55:58 2022 +0000 + + !133 添加Display模块HDI接口的IDL中文注释 + Merge pull request !133 from 朱思远/cherry-pick-1662377094 + +commit e76ae4776d0ed3ec8176d0ce48b78c83baa8155f +Author: vb6174 +Date: Wed Aug 24 08:45:32 2022 +0000 + + feat: add audio idl zh-cn + + Signed-off-by: vb6174 + +commit 840ff0b254553f86729b0b5efa03e450cebf731d +Author: muxiaoximuxiaoxi +Date: Mon Sep 5 04:04:24 2022 -0700 + + fixed 32dc805 from https://gitee.com/zhusiyuan2/interface_native_header/pulls/127 + fix：Display adds IDL Chinese translation + + Signed-off-by: muxiaoximuxiaoxi + +commit 31832bf576fcf345cfcd782cafcadff248e4c55c +Merge: ac38b18 2c4889e +Author: openharmony_sig_ci +Date: Mon Sep 5 06:05:32 2022 +0000 + + !128 nativeSdk 资料 + Merge pull request !128 from 郭春婷/master + +commit 1bcb28fd5c849a2278947a1dd4ab347c43b893c8 +Author: shawn_he +Date: Mon Sep 5 09:58:05 2022 +0800 + + update doc + + Signed-off-by: shawn_he + +commit 2c4889ed47d74efa1eba1d87583b213c0b329fa9 +Author: guo-chunting +Date: Fri Sep 2 17:57:46 2022 +0800 + + nativeSDK for Distribute + + Signed-off-by: guo-chunting + +commit a4b0c916a1ba74e675b32d780ba271d06aea1ea9 +Author: guo-chunting +Date: Fri Sep 2 15:02:01 2022 +0800 + + nativeSDK for Distribute + + Signed-off-by: guo-chunting diff --git a/zh-cn/native_sdk/media/av_session/avmeta_data.h b/zh-cn/native_sdk/media/av_session/avmeta_data.h index e4b96ea36fdf8d1240e41242dcc4802dccfeedfc..87404d401cbba53eb671db065c52959ac98122b6 100644 --- a/zh-cn/native_sdk/media/av_session/avmeta_data.h +++ b/zh-cn/native_sdk/media/av_session/avmeta_data.h @@ -336,9 +336,9 @@ public: std::shared_ptr GetMediaImage() const; /** - * @brief 设置媒体图片url。 + * @brief 设置媒体图片URI。 * - * @param mediaImageUri 媒体图片url。 + * @param mediaImageUri 媒体图片URI。 * @see GetMediaImageUri * @since 9 * @version 1.0 @@ -346,9 +346,9 @@ public: void SetMediaImageUri(const std::string& mediaImageUri); /** - * @brief 获取媒体图片url。 + * @brief 获取媒体图片URI。 * - * @return 返回媒体图片url。 + * @return 返回媒体图片URI。 * @see SetMediaImageUri * @since 9 * @version 1.0 @@ -674,7 +674,7 @@ private: static void CloneMediaImage(const AVMetaData& from, AVMetaData& to); /** - * @brief 将源会话元数据的图片url拷贝至目标会话元数据的图片url。 + * @brief 将源会话元数据的图片URI拷贝至目标会话元数据的图片URI。 * * @param from 源会话元数据{@link AVMetaData}。 * @param to 目标会话元数据{@link AVMetaData}。 diff --git a/zh-cn/native_sdk/media/av_session/avsession_controller.h b/zh-cn/native_sdk/media/av_session/avsession_controller.h index 5de296031631f0b95e656b4438169db78cd98a71..3cb929fd842a5cc216fe76de5b235badf524bd57 100644 --- a/zh-cn/native_sdk/media/av_session/avsession_controller.h +++ b/zh-cn/native_sdk/media/av_session/avsession_controller.h @@ -117,7 +117,7 @@ public: /** * @brief 获取session的激活状态。 * - * @param isActive session是否激活，类型为{@link AVSessionController}。 + * @param isActive session是否激活。 * @return 成功返回{@link #AVSESSION_SUCCESS}；失败则返回对应错误码。 * @see AVSession#Activate * @see AVSession#Deactivate diff --git a/zh-cn/native_sdk/media/av_session/avsession_manager.h b/zh-cn/native_sdk/media/av_session/avsession_manager.h index 73da20fbdc180bd3c68276a963b712735a3eb0e4..3cd80c80fa253d2965fcd5bf66677f9fa118903d 100644 --- a/zh-cn/native_sdk/media/av_session/avsession_manager.h +++ b/zh-cn/native_sdk/media/av_session/avsession_manager.h @@ -102,7 +102,7 @@ public: * @brief 通过会话ID获得会话描述的方法。 * * @param sessionId AVSession的会话标签。 - * @param descriptor AVSession的会话类型，类型为{@link AVSessionDescriptor}。 + * @param descriptor AVSession的会话描述，类型为{@link AVSessionDescriptor}。 * @return 成功返回{@link #AVSESSION_SUCCESS}；失败则返回对应错误码。 * @since 9 * @version 1.0