From ec83e18321a68001e4265c8ffba2c604a44eb1d9 Mon Sep 17 00:00:00 2001 From: wujinhui Date: Tue, 19 Aug 2025 15:59:29 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E5=9B=9E=E9=80=80api21=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wujinhui --- arkui/ace_engine/native/libace.ndk.json | 4 ---- arkui/ace_engine/native/native_node.h | 15 --------------- 2 files changed, 19 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 4a896d6404f..3c739a283d0 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -1559,10 +1559,6 @@ "first_introduced": "18", "name": "OH_ArkUI_NodeUtils_MoveTo" }, - { - "first_introduced": "21", - "name": "OH_ArkUI_NativeModule_InvalidateAttributes" - }, { "first_introduced": "15", "name": "OH_ArkUI_NodeUtils_SetCrossLanguageOption" diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index ce5b57eb466..50ede589c7f 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -9893,21 +9893,6 @@ int32_t OH_ArkUI_NodeUtils_GetAttachedNodeHandleById(const char* id, ArkUI_NodeH */ int32_t OH_ArkUI_NodeUtils_MoveTo(ArkUI_NodeHandle node, ArkUI_NodeHandle target_parent, int32_t index); -/** - * @brief Triggers node updates in the current frame. - * When node attributes are modified after the current frame's build phase (i.e., after - * the unified processing of dirty nodes), the node updates will be deferred to the next - * frame. This function forces immediate node updates within the current frame to - * ensure rendering effects are applied synchronously. - * - * @param node ArkUI_NodeHandle pointer. - * @return Error code. - * {@link ARKUI_ERROR_CODE_NO_ERROR} Success. - * {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function parameter exception. - * @since 21 - */ -int32_t OH_ArkUI_NativeModule_InvalidateAttributes(ArkUI_NodeHandle node); - /** * @brief Set the cross-language option of the target node handle. * -- Gitee From a6fc122b727503485ff2a67275a517bad333aa64 Mon Sep 17 00:00:00 2001 From: huangtianyu Date: Tue, 19 Aug 2025 10:09:42 +0000 Subject: [PATCH 02/22] ResetLoudnessGain Signed-off-by: huangtianyu --- multimedia/player_framework/lowpower_audio_sink.h | 14 -------------- .../lowpower_avsink/liblowpower_avsink.ndk.json | 4 ---- 2 files changed, 18 deletions(-) diff --git a/multimedia/player_framework/lowpower_audio_sink.h b/multimedia/player_framework/lowpower_audio_sink.h index 07f24a29998..226f1f17a29 100644 --- a/multimedia/player_framework/lowpower_audio_sink.h +++ b/multimedia/player_framework/lowpower_audio_sink.h @@ -258,20 +258,6 @@ OH_AVErrCode OH_LowPowerAudioSink_SetPlaybackSpeed(OH_LowPowerAudioSink* sink, c */ OH_AVErrCode OH_LowPowerAudioSink_ReturnSamples(OH_LowPowerAudioSink* sink, OH_AVSamplesBuffer* samples); -/** - * @brief Set the loudness gain for lowpower audio sink. - * - * @param {OH_LowPowerAudioSink*} sink Pointer to an OH_LowPowerAudioSink instance. - * @param {float} loudnessGain Loudness gain to set which changes from -90.0 to 24.0, expressing in dB. - * The default loudness gain is 0.0dB. - * @return Returns AV_ERR_OK if the gain is set successfully; - * otherwise, returns a specific error code as defined in {@link OH_AVErrCode} - * {@link AV_ERR_INVALID_VAL} the sink is nullptr or loudnessGain is out of valid range. - * {@link AV_ERR_SERVICE_DIED} media service is died. - * @since 20 - */ -OH_AVErrCode OH_LowPowerAudioSink_SetLoudnessGain(OH_LowPowerAudioSink* sink, float loudnessGain); - /** * @brief Regsister callback instance for lowpower audio sink. * diff --git a/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json b/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json index 7e53713e491..079f642c5fb 100644 --- a/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json +++ b/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json @@ -67,10 +67,6 @@ "first_introduced": "20", "name": "OH_LowPowerAudioSink_ReturnSamples" }, - { - "first_introduced": "20", - "name": "OH_LowPowerAudioSink_SetLoudnessGain" - }, { "first_introduced": "20", "name": "OH_LowPowerAudioSink_RegisterCallback" -- Gitee From 1cf31e0a67bab5c6f723b44540f7cabecde50413 Mon Sep 17 00:00:00 2001 From: liujiaxing2024 Date: Tue, 19 Aug 2025 20:04:43 +0800 Subject: [PATCH 03/22] =?UTF-8?q?hiappevent=20API=2021=E5=9B=9E=E9=80=80re?= =?UTF-8?q?s6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liujiaxing2024 Change-Id: Iff6574c49f0d592d3d63d6f04e5389d4905697a6 --- .../hiappevent/include/hiappevent/hiappevent_event.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h b/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h index 83c319e6c04..06f186ed5ad 100644 --- a/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h +++ b/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h @@ -168,14 +168,6 @@ extern "C" { */ #define EVENT_APP_KILLED "APP_KILLED" -/** - * @brief audio jank frame event. - * - * @since 21 - * @version 1.0 - */ -#define EVENT_AUDIO_JANK_FRAME "AUDIO_JANK_FRAME" - /** * @brief OS domain. * -- Gitee From 7709a9ef2411c722359b25f27f356b46dabe21d7 Mon Sep 17 00:00:00 2001 From: xushunjie Date: Sat, 23 Aug 2025 11:55:51 +0800 Subject: [PATCH 04/22] revert image capi Signed-off-by: xushunjie --- arkui/ace_engine/native/native_node.h | 108 -------------------------- arkui/ace_engine/native/native_type.h | 40 ---------- 2 files changed, 148 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 50ede589c7f..da039536207 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -2761,114 +2761,6 @@ typedef enum { * @since 20 */ NODE_IMAGE_SYNC_LOAD = 4012, - /** - * @brief Defines the image decoding size attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: width of the image decoding, in px.\n - * .value[1].i32: height of the image decoding, in px.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: width of the image decoding, in px.\n - * .value[1].i32: height of the image decoding, in px.\n - * - * @since 21 - */ - NODE_IMAGE_SOURCE_SIZE = 4013, - /** - * @brief Defines the display tranformation matrix for an image. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0...15].f32: 16 floating-point numbers.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0...15].f32: 16 floating-point numbers.\n - * - * @since 21 - */ - NODE_IMAGE_IMAGE_MATRIX = 4014, - /** - * @brief Defines the image follow text direction attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: whether to follows the text direction.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: whether to follows the text direction.\n - * - * @since 21 - */ - NODE_IMAGE_MATCH_TEXT_DIRECTION = 4015, - /** - * @brief Defines the image copy attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: copy option {@link ArkUI_CopyOptions}. The default value is ARKUI_COPY_OPTIONS_NONE.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: copy option {@link ArkUI_CopyOptions.\n - * - * @since 21 - */ - NODE_IMAGE_COPY_OPTION = 4016, - /** - * @brief Defines the image AI analysis enable attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: whether to enable AI analysis for the image.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: whether to enable AI analysis for the image.\n - * - * @since 21 - */ - NODE_IMAGE_ENABLE_ANALYZER = 4017, - /** - * @brief Defines the image dynamic display range attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: dynamic range mode {@link ArkUI_DynamicRangeMode}. - * The default value is ARKUI_DYNAMIC_RANGE_MODE_STANDARD.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: dynamic range mode {@link ArkUI_DynamicRangeMode.\n - * - * @since 21 - */ - NODE_IMAGE_DYNAMIC_RANGE_MODE = 4018, - /** - * @brief Defines the image dynamic display brightness attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].f32: hdr brightness. value range [0, 1]\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].f32: hdr brightness. value range [0, 1]\n - * - * @since 21 - */ - NODE_IMAGE_HDR_BRIGHTNESS = 4019, - /** - * @brief Defines the image display direction attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: orientation {@link ArkUI_Orientation}. - * The default value is ARKUI_ORIENTATION_UP.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: orientation {@link ArkUI_Orientation.\n - * - * @since 21 - */ - NODE_IMAGE_ORIENTATION = 4020, /** * @brief Defines the color of the component when it is selected. * This attribute can be set, reset, and obtained as required through APIs. diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 7cef398b2d6..3bfa0c36dc2 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -1374,46 +1374,6 @@ typedef enum { ARKUI_IMAGE_INTERPOLATION_HIGH, } ArkUI_ImageInterpolation; -/** - * @brief Enumerates the image dynamic range mode. - * - * @since 21 - */ -typedef enum { - /** high dynamic range mode. */ - ARKUI_DYNAMIC_RANGE_MODE_HIGH = 0, - /** constraint dynamic range mode. */ - ARKUI_DYNAMIC_RANGE_MODE_CONSTRAINT, - /** standard dynamic range mode. */ - ARKUI_DYNAMIC_RANGE_MODE_STANDARD, -} ArkUI_DynamicRangeMode; - -/** - * @brief Enumerates the image rotate orientation. - * - * @since 21 - */ -typedef enum { - /** Use EXIF metadata for display orientation, with support for rotation and mirroring. */ - ARKUI_ORIENTATION_AUTO = 0, - /** Display original pixel data without transformation. */ - ARKUI_ORIENTATION_UP, - /** Display the image after rotating it 90 degrees clockwise. */ - ARKUI_ORIENTATION_RIGHT, - /** Display the image after rotating it 180 degrees clockwise. */ - ARKUI_ORIENTATION_DOWN, - /** Display the image after rotating it 270 degrees clockwise. */ - ARKUI_ORIENTATION_LEFT, - /** Display the image after flipping it horizontally. */ - ARKUI_ORIENTATION_UP_MIRRORED, - /** Display the image after flipping it horizontally and then rotating it 90 degrees clockwise. */ - ARKUI_ORIENTATION_RIGHT_MIRRORED, - /** Display the image after flipping it vertically. */ - ARKUI_ORIENTATION_DOWN_MIRRORED, - /** Display the image after flipping it horizontally and then rotating it 270 degrees clockwise. */ - ARKUI_ORIENTATION_LEFT_MIRRORED, -} ArkUI_ImageRotateOrientation; - /** * @brief Enumerates the blend modes. * -- Gitee From f556118af152b38f9f5e351f3b6f5d8e681f695f Mon Sep 17 00:00:00 2001 From: wanglili12 Date: Sat, 23 Aug 2025 17:51:10 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanglili12 --- arkui/ace_engine/native/native_node.h | 98 ++++++++++++++------------- 1 file changed, 51 insertions(+), 47 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 50ede589c7f..3cefac3f1cb 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1807,8 +1807,8 @@ typedef enum { * */ NODE_VISIBLE_AREA_CHANGE_RATIO = 93, - - /** + + /** * @brief Sets the transition effect when the component is inserted or deleted. * This attribute can be set, and obtained as required through APIs. * @@ -1981,7 +1981,8 @@ typedef enum { NODE_TRANSLATE_WITH_PERCENT = 103, /** - * @brief Sets component rotation with multi-axis angle control. This attribute can be set, reset, and obtained as required through APIs. + * @brief Sets component rotation with multi-axis angle control. This attribute can be set, reset, + * and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n * .value[0].f32: x-axis rotation angle. The default value is 0. \n @@ -2445,7 +2446,8 @@ typedef enum { NODE_TEXT_LINEAR_GRADIENT = 1033, /** - * @brief Sets a radial gradient effect for text. This attribute can be set, reset, and obtained as required through APIs. + * @brief Sets a radial gradient effect for text. + * This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n * .value[0]?.f32: X-coordinate of the radial gradient center relative to the upper left corner of the text. \n @@ -3379,6 +3381,7 @@ typedef enum { * @since 15 */ NODE_TEXT_INPUT_LETTER_SPACING = 7032, + /** * @brief Sets whether to enable preview text for the TextInput component. * This attribute can be set, reset, and obtained as required through APIs. @@ -3430,17 +3433,17 @@ typedef enum { * * @since 20 */ - NODE_TEXT_INPUT_ENABLE_FILL_ANIMATION = 7036, - + NODE_TEXT_INPUT_ENABLE_FILL_ANIMATION = 7036, + /** * @brief Set the line height of the input node. * This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value. * \n * Format of the return value {@link ArkUI_AttributeItem}: \n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value * * @since 20 */ @@ -3729,6 +3732,7 @@ typedef enum { * */ NODE_TEXT_AREA_SHOW_KEYBOARD_ON_FOCUS, + /** * @brief When this property is set, the height of the textArea component is calculated using this property. * @@ -3795,13 +3799,13 @@ typedef enum { NODE_TEXT_AREA_KEYBOARD_APPEARANCE = 8026, /** - * @brief Set the max lines of the node. This attrilbute can be set, reset, and obtained as required through APIs. + * @brief Set the max lines of the node. This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: max lines count. \n + * .value[0].i32: max lines count. * \n * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: max lines count. \n + * .value[0].i32: max lines count.\n * * @since 20 */ @@ -3820,19 +3824,19 @@ typedef enum { */ NODE_TEXT_AREA_LINE_SPACING = 8028, - /** - * @brief Set the min lines of the node. This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: min lines count. - * \n - * Format of the return value {@link ArkUI_AttributeItem}: \n - * .value[0].i32: min line count.\n - * - * @since 20 - * - */ - NODE_TEXT_AREA_MIN_LINES = 8029, + /** + * @brief Set the min lines of the node. This attribute can be set, reset, and obtained as required through APIs. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].i32: min lines count. + * \n + * Format of the return value {@link ArkUI_AttributeItem}: \n + * .value[0].i32: min line count.\n + * + * @since 20 + * + */ + NODE_TEXT_AREA_MIN_LINES = 8029, /** * @brief Set the max lines of the node with scroll. @@ -3846,16 +3850,16 @@ typedef enum { * * @since 20 */ - NODE_TEXT_AREA_MAX_LINES_WITH_SCROLL = 8030, + NODE_TEXT_AREA_MAX_LINES_WITH_SCROLL = 8030, /** * @brief Set the line height of the node. This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value. * \n * Format of the return value {@link ArkUI_AttributeItem}: \n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value * * @since 20 */ @@ -4403,7 +4407,7 @@ typedef enum { * */ NODE_TIME_PICKER_SELECTED_TEXT_STYLE, - /** + /** * @brief Defines the start time of the time picker. * This attribute can be set, reset, and obtained as required through APIs. * @@ -6977,7 +6981,8 @@ typedef enum { /** * @brief Defines the gesture event type. * - * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is {@link ArkUI_UIInputEvent}. + * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is + * {@link ArkUI_UIInputEvent}. */ NODE_TOUCH_EVENT = 0, @@ -7335,11 +7340,11 @@ typedef enum { */ NODE_TEXT_ON_DETECT_RESULT_UPDATE = MAX_NODE_SCOPE_NUM * ARKUI_NODE_TEXT, /** - * @brief Defines the long press event for span + * @brief Defines the long press event for span. * * The event is triggered when the span is long pressed. * When the event callback occurs, the {@link ArkUI_NodeEvent} object can be obtained from the - * {@link ArkUI_UIInputEvent} object.\n + * {@link ArkUI_UIInputEvent} object. \n * @since 20 */ NODE_TEXT_SPAN_ON_LONG_PRESS = 1001, @@ -7587,7 +7592,7 @@ typedef enum { NODE_TEXT_INPUT_ON_CHANGE_WITH_PREVIEW_TEXT = 7013, /** - * @brief Defines the event triggered before content changes. + * @brief Defines the event triggered before content changes * * When the event callback occurs, the union type {@link ArkUI_NodeEvent} is {@link ArkUI_TextChangeEvent}. \n * {@link ArkUI_TextChangeEvent} contains the following parameters: \n @@ -7766,7 +7771,7 @@ typedef enum { NODE_TEXT_AREA_ON_CHANGE_WITH_PREVIEW_TEXT = 8012, /** - * @brief Defines the event triggered before content changes + * @brief Defines the event triggered before content changes. * * When the event callback occurs, the union type {@link ArkUI_NodeEvent} is {@link ArkUI_TextChangeEvent}. \n * {@link ArkUI_TextChangeEvent} contains the following parameters: \n @@ -9866,18 +9871,6 @@ float OH_ArkUI_SystemFontStyleEvent_GetFontSizeScale(const ArkUI_SystemFontStyle */ float OH_ArkUI_SystemFontStyleEvent_GetFontWeightScale(const ArkUI_SystemFontStyleEvent* event); -/** - * @brief Get the node handle by id. - * - * @param id The id of the target node handle. - * @param node The handle of target node handle. - * @return Error code. - * {@link ARKUI_ERROR_CODE_NO_ERROR} success. - * {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function parameter exception. - * @since 15 - */ -int32_t OH_ArkUI_NodeUtils_GetAttachedNodeHandleById(const char* id, ArkUI_NodeHandle* node); - /** * @brief Move the node handle to target parent node as child. * @@ -9931,7 +9924,6 @@ int32_t OH_ArkUI_NodeUtils_GetCrossLanguageOption(ArkUI_NodeHandle node, ArkUI_C int32_t OH_ArkUI_RegisterLayoutCallbackOnNodeHandle(ArkUI_NodeHandle node, void* userData, void (*onLayoutCompleted)(void* userData)); - /** * @brief Registers a callback for node when draw is completed. * @@ -9968,6 +9960,18 @@ int32_t OH_ArkUI_UnregisterLayoutCallbackOnNodeHandle(ArkUI_NodeHandle node); */ int32_t OH_ArkUI_UnregisterDrawCallbackOnNodeHandle(ArkUI_NodeHandle node); +/** + * @brief Get the node handle by id. + * + * @param id The id of the target node handle. + * @param node The handle of target node handle. + * @return Error code. + * {@link ARKUI_ERROR_CODE_NO_ERROR} success. + * {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function parameter exception. + * @since 15 + */ +int32_t OH_ArkUI_NodeUtils_GetAttachedNodeHandleById(const char* id, ArkUI_NodeHandle* node); + /** * @brief Get the snapshot pixelmap for the given node synchronously, will get error if the node is not on the * tree or is not rendered yet. @@ -10048,7 +10052,7 @@ ArkUI_ErrorCode OH_ArkUI_RemoveSupportedUIStates(ArkUI_NodeHandle node, int32_t /** * @brief Run a custom function inside the UIContext scope. * - * @param uiContext Indicates the pointer to a UI instance. + * @param uiContext ArkUI_ContextHandle. * @param userData Indicates the pointer to the custom data. * @param callback The custom function. * @return Returns the result code. -- Gitee From 030c7ea76ec8dc26f65b9fcd2d6eba4f521bbe06 Mon Sep 17 00:00:00 2001 From: ZhaoJinghui Date: Tue, 12 Aug 2025 19:44:29 +0800 Subject: [PATCH 06/22] add errcode desc Signed-off-by: ZhaoJinghui Change-Id: Id50022da6a812a08f9763ecf3ebcd525659253aa --- distributeddatamgr/relational_store/include/data_asset.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/distributeddatamgr/relational_store/include/data_asset.h b/distributeddatamgr/relational_store/include/data_asset.h index f791cbc9e81..85c4fbdf6ba 100644 --- a/distributeddatamgr/relational_store/include/data_asset.h +++ b/distributeddatamgr/relational_store/include/data_asset.h @@ -326,7 +326,9 @@ Data_Asset *OH_Data_Asset_CreateOne(void); * * @param asset Represents a pointer to an {@link Data_Asset} instance. * @return Returns the status code of the execution. Successful execution returns RDB_OK, - * while failure returns a specific error code. Specific error codes can be referenced {@link OH_Rdb_ErrCode}. + * while failure returns a specific error code. + * {@link RDB_OK} - success. + * Specific error codes can be referenced {@link OH_Rdb_ErrCode}. * @see Data_Asset, OH_Rdb_ErrCode. * @since 11 */ @@ -349,7 +351,9 @@ Data_Asset **OH_Data_Asset_CreateMultiple(uint32_t count); * @param assets Represents a pointer to an {@link Data_Asset} instance. * @param count Represents the count of {@link Data_Asset} to destroy. * @return Returns the status code of the execution. Successful execution returns RDB_OK, - * while failure returns a specific error code. Specific error codes can be referenced {@link OH_Rdb_ErrCode}. + * while failure returns a specific error code. + * {@link RDB_OK} - success. + * Specific error codes can be referenced {@link OH_Rdb_ErrCode}. * @see Data_Asset, OH_Rdb_ErrCode. * @since 11 */ -- Gitee From 3e030f7365985ba80be0f85ba2ce661a90faa78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=9B=BD=E5=86=9B?= Date: Tue, 26 Aug 2025 16:50:27 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=B8=8B=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任国军 --- AbilityKit/ability_runtime/application_context.h | 13 ------------- .../ability_runtime/libability_runtime.ndk.json | 4 ---- 2 files changed, 17 deletions(-) diff --git a/AbilityKit/ability_runtime/application_context.h b/AbilityKit/ability_runtime/application_context.h index 00c5d579d45..ed62cf40293 100644 --- a/AbilityKit/ability_runtime/application_context.h +++ b/AbilityKit/ability_runtime/application_context.h @@ -294,19 +294,6 @@ AbilityRuntime_ErrorCode OH_AbilityRuntime_StartSelfUIAbility(AbilityBase_Want * AbilityRuntime_ErrorCode OH_AbilityRuntime_StartSelfUIAbilityWithStartOptions(AbilityBase_Want *want, AbilityRuntime_StartOptions *options); - /** - * @brief Obtain the version code of the application. - * - * @param versionCode The version code of the application. - * @return The error code. - * {@link ABILITY_RUNTIME_ERROR_CODE_NO_ERROR} if the operation is successful. - * {@link ABILITY_RUNTIME_ERROR_CODE_PARAM_INVALID} if the versionCode is null. - * {@link ABILITY_RUNTIME_ERROR_CODE_CONTEXT_NOT_EXIST} if the application context does not exist. - * {@link ABILITY_RUNTIME_ERROR_CODE_GET_APPLICATION_INFO_FAILED} if the application info does not exist. - * @since 21 - */ -AbilityRuntime_ErrorCode OH_AbilityRuntime_ApplicationContextGetVersionCode(int64_t* versionCode); - #ifdef __cplusplus } // extern "C" #endif diff --git a/AbilityKit/ability_runtime/libability_runtime.ndk.json b/AbilityKit/ability_runtime/libability_runtime.ndk.json index f7939128e40..6790d7d683b 100644 --- a/AbilityKit/ability_runtime/libability_runtime.ndk.json +++ b/AbilityKit/ability_runtime/libability_runtime.ndk.json @@ -178,9 +178,5 @@ { "first_introduced": "20", "name": "OH_AbilityRuntime_ApplicationContextGetResourceDir" - }, - { - "first_introduced": "21", - "name": "OH_AbilityRuntime_ApplicationContextGetVersionCode" } ] \ No newline at end of file -- Gitee From 1ef7a541ecfee942a6c8ccf84c6ab197cf8a848a Mon Sep 17 00:00:00 2001 From: sty28558 Date: Tue, 26 Aug 2025 17:04:59 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E8=93=9D=E9=BB=84=E5=90=8C=E6=AD=A5nativ?= =?UTF-8?q?=5Fchild=5Fprocess.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sty28558 --- .../child_process/native_child_process.h | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ability/ability_runtime/child_process/native_child_process.h b/ability/ability_runtime/child_process/native_child_process.h index ce59adf740b..796b7920568 100644 --- a/ability/ability_runtime/child_process/native_child_process.h +++ b/ability/ability_runtime/child_process/native_child_process.h @@ -152,13 +152,13 @@ typedef struct Ability_ChildProcessConfigs Ability_ChildProcessConfigs; Ability_ChildProcessConfigs* OH_Ability_CreateChildProcessConfigs(); /** - * @brief Destroys a child process configs object and releases associated rescources. + * @brief Destroys a child process configs object and releases associated resources. * * @param configs Pointer to the child process configs object to be destroyed. * After this call, the pointer becomes invalid and must not be used. * Passing nullptr is allowed and will be ignored. * @return Returns {@link NCP_NO_ERROR} if the operation is successful or if the input is nullptr. - * Returns {@link NCP_NO_ERR_INVALID_PARAM} if the input parameters are invalid. + * Returns {@link NCP_ERR_INVALID_PARAM} if the input parameters are invalid. * @since 20 */ Ability_NativeChildProcess_ErrCode OH_Ability_DestroyChildProcessConfigs(Ability_ChildProcessConfigs* configs); @@ -169,8 +169,8 @@ Ability_NativeChildProcess_ErrCode OH_Ability_DestroyChildProcessConfigs(Ability * * @param configs Pointer to the child process configs object. Must not be nullptr. * @param isolationMode The isolation mode to set. See {@link NativeChildProcess_IsolationMode} for details. - * @return Returns {@link NCP_NO_ERROR} if the isolation mode is set successful. - * Returns {@link NCP_NO_ERR_INVALID_PARAM} if the input parameters are invalid. + * @return Returns {@link NCP_NO_ERROR} if the isolation mode is set successfully. + * Returns {@link NCP_ERR_INVALID_PARAM} if the input parameters are invalid. * @since 20 */ Ability_NativeChildProcess_ErrCode OH_Ability_ChildProcessConfigs_SetIsolationMode( @@ -184,8 +184,8 @@ Ability_NativeChildProcess_ErrCode OH_Ability_ChildProcessConfigs_SetIsolationMo * Must be a non-empty string containing only letters, digits, or underscores. * Maximum length is 64 characters. * The name ultimately assigned to the process is {bundleName}:{processName}. - * @return Returns {@link NCP_NO_ERROR} if the process name is set successful. - * Returns {@link NCP_NO_ERR_INVALID_PARAM} if the input parameters are invalid. + * @return Returns {@link NCP_NO_ERROR} if the process name is set successfully. + * Returns {@link NCP_ERR_INVALID_PARAM} if the input parameters are invalid. * @since 20 */ Ability_NativeChildProcess_ErrCode OH_Ability_ChildProcessConfigs_SetProcessName(Ability_ChildProcessConfigs* configs, @@ -426,7 +426,7 @@ Ability_NativeChildProcess_ErrCode OH_Ability_StartNativeChildProcessWithConfigs NativeChildProcess_Args* OH_Ability_GetCurrentChildProcessArgs(); /** - * @brief Define a callback function to handle the exit of a native child process. + * @brief Defines a callback function to handle the exit of a native child process. * * @param pid The pid of the exited native child process. * @param signal The signal of the exited native child process. @@ -434,14 +434,13 @@ NativeChildProcess_Args* OH_Ability_GetCurrentChildProcessArgs(); */ typedef void (*OH_Ability_OnNativeChildProcessExit)(int32_t pid, int32_t signal); -/** + /** * @brief Register a native child process exit callback. * Registering the same callback repeatedly will only keep one. * * @param onProcessExit Pointer to the callback function to handle the exit of a native child process. * For details, see {@link OH_Ability_OnNativeChildProcessExit}. * @return Returns {@link NCP_NO_ERROR} if the call is successful. - * Returns {@link NCP_ERR_INVALID_PARAM} if the param is invalid. * Returns {@link NCP_ERR_INTERNAL} if internal error occurs. * For details, see {@link Ability_NativeChildProcess_ErrCode}. * @since 20 @@ -449,13 +448,12 @@ typedef void (*OH_Ability_OnNativeChildProcessExit)(int32_t pid, int32_t signal) Ability_NativeChildProcess_ErrCode OH_Ability_RegisterNativeChildProcessExitCallback( OH_Ability_OnNativeChildProcessExit onProcessExit); -/** + /** * @brief Unregister a native child process exit callback. * * @param onProcessExit Pointer to the callback function to handle the exit of a native child process. * For details, see {@link OH_Ability_OnNativeChildProcessExit}. * @return Returns {@link NCP_NO_ERROR} if the call is successful. - * Returns {@link NCP_ERR_INVALID_PARAM} if the param is invalid. * Returns {@link NCP_ERR_INTERNAL} if internal error occurs. * Returns {@link NCP_ERR_CALLBACK_NOT_EXIST} if the callback is not exist. * For details, see {@link Ability_NativeChildProcess_ErrCode}. -- Gitee From 059a196bfd683728fee5a2a6bb40de839ce14455 Mon Sep 17 00:00:00 2001 From: wang-ziweix Date: Tue, 26 Aug 2025 20:09:35 +0800 Subject: [PATCH 09/22] [6.0r_sdk] low latency only support video decoder Signed-off-by: wang-ziweix --- multimedia/av_codec/native_avcapability.h | 2 +- multimedia/av_codec/native_avcodec_base.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/av_codec/native_avcapability.h b/multimedia/av_codec/native_avcapability.h index 1d0af06b2b4..3c8649510a6 100644 --- a/multimedia/av_codec/native_avcapability.h +++ b/multimedia/av_codec/native_avcapability.h @@ -84,7 +84,7 @@ typedef enum OH_AVCapabilityFeature { VIDEO_ENCODER_TEMPORAL_SCALABILITY = 0, /** Feature for codec supports long-term reference. It is only used in video encoder. */ VIDEO_ENCODER_LONG_TERM_REFERENCE = 1, - /** Feature for codec supports low latency. It is used in video encoder and video decoder. */ + /** Feature for codec supports low latency. It is only used in video decoder. */ VIDEO_LOW_LATENCY = 2, /** Feature for codec supports B-frame encoding. It is only used in video encoder. * @since 20 diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 7745ac2101f..0042b76b4a2 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -944,8 +944,8 @@ extern const char *OH_MD_KEY_VIDEO_PIC_WIDTH; extern const char *OH_MD_KEY_VIDEO_PIC_HEIGHT; /** * @brief Key to enable the low latency mode, value type is int32_t (0 or 1):1 is enabled, 0 otherwise. - * If enabled, the video encoder or video decoder doesn't hold input and output data more than required by - * the codec standards. This is an optional key that applies only to video encoder or video decoder. + * If enabled, the video decoder doesn't hold input and output data more than required by + * the codec standards. This is an optional key that applies only to video decoder. * It is used in configure. * * @syscap SystemCapability.Multimedia.Media.CodecBase -- Gitee From 54fdab579606df87632ec1eac9f8f46cd7d46fe5 Mon Sep 17 00:00:00 2001 From: cheerful_ricky Date: Wed, 20 Aug 2025 14:32:13 +0800 Subject: [PATCH 10/22] fix history comments Signed-off-by: cheerful_ricky --- BasicServicesKit/commonevent/oh_commonevent.h | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/BasicServicesKit/commonevent/oh_commonevent.h b/BasicServicesKit/commonevent/oh_commonevent.h index d3f16a959a7..a5cca763b88 100644 --- a/BasicServicesKit/commonevent/oh_commonevent.h +++ b/BasicServicesKit/commonevent/oh_commonevent.h @@ -227,19 +227,19 @@ CommonEvent_ErrCode OH_CommonEvent_UnSubscribe(const CommonEvent_Subscriber* sub const char* OH_CommonEvent_GetEventFromRcvData(const CommonEvent_RcvData* rcvData); /** - * @brief Get event result code from callback data. + * @brief Get event code from callback data. * * @param rcvData Indicates the callback data. - * @return Returns the event of result code, default is 0. + * @return Returns the event of code, default is 0. * @since 12 */ int32_t OH_CommonEvent_GetCodeFromRcvData(const CommonEvent_RcvData* rcvData); /** - * @brief Get event result data from callback data. + * @brief Get event data from callback data. * * @param rcvData Indicates the callback data. - * @return Returns the event of result data, default is null. + * @return Returns the event of data, default is null. * @since 12 */ const char* OH_CommonEvent_GetDataStrFromRcvData(const CommonEvent_RcvData* rcvData); @@ -628,7 +628,7 @@ CommonEvent_ErrCode OH_CommonEvent_SetDoubleArrayToParameters(CommonEvent_Parame const double* value, size_t num); /** - * @brief Publish a standard commen event. + * @brief Publish a commen event. * * @param event Indicates the name of the common event. * @return Returns the error code. @@ -704,39 +704,39 @@ bool OH_CommonEvent_AbortCommonEvent(CommonEvent_Subscriber* subscriber); bool OH_CommonEvent_ClearAbortCommonEvent(CommonEvent_Subscriber* subscriber); /** - * @brief Get result code from an ordered event by a subscriber. + * @brief Get code from an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @return Returns the result code, default is 0. + * @return Returns the code, default is 0. * @since 18 */ int32_t OH_CommonEvent_GetCodeFromSubscriber(const CommonEvent_Subscriber* subscriber); /** - * @brief Set result code to an ordered event by a subscriber. + * @brief Set code to an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @param code Indicates the result code. + * @param code Indicates the code. * @return Returns the result of operation, true means succeeded. * @since 18 */ bool OH_CommonEvent_SetCodeToSubscriber(CommonEvent_Subscriber* subscriber, int32_t code); /** - * @brief Get result data from an ordered event by a subscriber. + * @brief Get data from an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @return Returns the result data, default is null. + * @return Returns the data, default is null. * @since 18 */ const char* OH_CommonEvent_GetDataFromSubscriber(const CommonEvent_Subscriber* subscriber); /** - * @brief Set result data to an ordered event by a subscriber. + * @brief Set data to an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @param data Indicates the result data. - * @param length Indicates the length of result data. + * @param data Indicates the data. + * @param length Indicates the length of data. * @return Returns the result of operation, true means succeeded. * @since 18 */ -- Gitee From a65fd45b7c17832faf59f25fba2599c2db3622ba Mon Sep 17 00:00:00 2001 From: wanglili12 Date: Wed, 27 Aug 2025 17:40:30 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanglili12 --- arkui/ace_engine/native/libace.ndk.json | 404 ++++++++++++------------ 1 file changed, 202 insertions(+), 202 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 3c739a283d0..93b2d6cf1c9 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -121,115 +121,111 @@ }, { "first_introduced": "12", - "name": "OH_NativeXComponent_RegisterUIInputEventCallback" + "name": "OH_ArkUI_GetNodeHandleFromNapiValue" }, { "first_introduced": "12", - "name": "OH_ArkUI_UIInputEvent_GetType" + "name": "OH_ArkUI_QueryModuleInterface" }, { "first_introduced": "12", - "name": "OH_ArkUI_UIInputEvent_GetEventTime" + "name": "OH_ArkUI_GestureEvent_GetActionType" }, { "first_introduced": "12", - "name": "OH_ArkUI_PointerEvent_GetX" + "name": "OH_ArkUI_GestureEvent_GetRawInputEvent" }, { "first_introduced": "12", - "name": "OH_ArkUI_PointerEvent_GetY" + "name": "OH_ArkUI_LongPress_GetRepeatCount" }, { "first_introduced": "12", - "name": "OH_ArkUI_PointerEvent_GetWindowX" + "name": "OH_ArkUI_PanGesture_GetVelocity" }, { "first_introduced": "12", - "name": "OH_ArkUI_PointerEvent_GetWindowY" + "name": "OH_ArkUI_PanGesture_GetVelocityY" }, { "first_introduced": "12", - "name": "OH_ArkUI_PointerEvent_GetDisplayX" + "name": "OH_ArkUI_PanGesture_GetVelocityX" }, { "first_introduced": "12", - "name": "OH_ArkUI_PointerEvent_GetDisplayY" + "name": "OH_ArkUI_PanGesture_GetOffsetX" }, { "first_introduced": "12", - "name": "OH_ArkUI_AxisEvent_GetVerticalAxisValue" + "name": "OH_ArkUI_PanGesture_GetOffsetY" }, { "first_introduced": "12", - "name": "OH_ArkUI_AxisEvent_GetHorizontalAxisValue" + "name": "OH_ArkUI_SwipeGesture_GetAngle" }, { "first_introduced": "12", - "name": "OH_ArkUI_AxisEvent_GetPinchAxisScaleValue" - }, - { - "first_introduced": "15", - "name": "OH_ArkUI_AxisEvent_GetAxisAction" + "name": "OH_ArkUI_SwipeGesture_GetVelocity" }, { "first_introduced": "12", - "name": "OH_ArkUI_GetNodeHandleFromNapiValue" + "name": "OH_ArkUI_RotationGesture_GetAngle" }, { "first_introduced": "12", - "name": "OH_ArkUI_GestureEvent_GetActionType" + "name": "OH_ArkUI_PinchGesture_GetScale" }, { "first_introduced": "12", - "name": "OH_ArkUI_GestureEvent_GetRawInputEvent" + "name": "OH_ArkUI_PinchGesture_GetCenterX" }, { "first_introduced": "12", - "name": "OH_ArkUI_LongPress_GetRepeatCount" + "name": "OH_ArkUI_PinchGesture_GetCenterY" }, { "first_introduced": "12", - "name": "OH_ArkUI_PanGesture_GetVelocity" + "name": "OH_NativeXComponent_RegisterSurfaceShowCallback" }, { "first_introduced": "12", - "name": "OH_ArkUI_PanGesture_GetVelocityY" + "name": "OH_NativeXComponent_RegisterSurfaceHideCallback" }, { "first_introduced": "12", - "name": "OH_ArkUI_PanGesture_GetVelocityX" + "name": "OH_NativeXComponent_RegisterUIInputEventCallback" }, { "first_introduced": "12", - "name": "OH_ArkUI_PanGesture_GetOffsetX" + "name": "OH_ArkUI_UIInputEvent_GetType" }, { "first_introduced": "12", - "name": "OH_ArkUI_PanGesture_GetOffsetY" + "name": "OH_ArkUI_UIInputEvent_GetEventTime" }, { "first_introduced": "12", - "name": "OH_ArkUI_SwipeGesture_GetAngle" + "name": "OH_ArkUI_PointerEvent_GetX" }, { "first_introduced": "12", - "name": "OH_ArkUI_SwipeGesture_GetVelocity" + "name": "OH_ArkUI_PointerEvent_GetY" }, { "first_introduced": "12", - "name": "OH_ArkUI_RotationGesture_GetAngle" + "name": "OH_ArkUI_PointerEvent_GetWindowX" }, { "first_introduced": "12", - "name": "OH_ArkUI_PinchGesture_GetScale" + "name": "OH_ArkUI_PointerEvent_GetWindowY" }, { "first_introduced": "12", - "name": "OH_ArkUI_PinchGesture_GetCenterX" + "name": "OH_ArkUI_PointerEvent_GetDisplayX" }, { "first_introduced": "12", - "name": "OH_ArkUI_PinchGesture_GetCenterY" + "name": "OH_ArkUI_PointerEvent_GetDisplayY" }, { "first_introduced": "12", @@ -333,15 +329,19 @@ }, { "first_introduced": "12", - "name": "OH_NativeXComponent_SetNeedSoftKeyboard" + "name": "OH_ArkUI_AxisEvent_GetVerticalAxisValue" }, { "first_introduced": "12", - "name": "OH_NativeXComponent_RegisterSurfaceShowCallback" + "name": "OH_ArkUI_AxisEvent_GetHorizontalAxisValue" }, { "first_introduced": "12", - "name": "OH_NativeXComponent_RegisterSurfaceHideCallback" + "name": "OH_ArkUI_AxisEvent_GetPinchAxisScaleValue" + }, + { + "first_introduced": "15", + "name": "OH_ArkUI_AxisEvent_GetAxisAction" }, { "first_introduced": "12", @@ -349,7 +349,7 @@ }, { "first_introduced": "12", - "name": "OH_ArkUI_QueryModuleInterface" + "name": "OH_NativeXComponent_SetNeedSoftKeyboard" }, { "first_introduced": "12", @@ -763,7 +763,7 @@ "first_introduced": "12", "name": "OH_ArkUI_WaterFlowSectionOption_RegisterGetItemMainSizeCallbackByIndexWithUserData" }, - { + { "first_introduced": "12", "name": "OH_ArkUI_AnimateOption_Create" }, @@ -835,6 +835,10 @@ "first_introduced": "12", "name": "OH_ArkUI_PointerEvent_SetInterceptHitTestMode" }, + { + "first_introduced": "12", + "name": "OH_NativeXComponent_GetNativeXComponent" + }, { "first_introduced": "12", "name": "OH_ArkUI_NodeContent_AddNode" @@ -871,10 +875,6 @@ "first_introduced": "12", "name": "OH_ArkUI_GetNodeContentFromNapiValue" }, - { - "first_introduced": "12", - "name": "OH_NativeXComponent_GetNativeXComponent" - }, { "first_introduced": "12", "name": "OH_ArkUI_MouseEvent_GetMouseButton" @@ -1799,6 +1799,18 @@ "first_introduced": "12", "name": "OH_ArkUI_AccessibilityValue_GetText" }, + { + "first_introduced": "12", + "name": "OH_ArkUI_NodeEvent_GetNumberValue" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_NodeEvent_GetStringValue" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_NodeEvent_SetReturnNumberValue" + }, { "first_introduced": "12", "name": "OH_ArkUI_AnimateOption_SetICurve" @@ -2043,18 +2055,6 @@ "first_introduced": "12", "name": "OH_ArkUI_Curve_DisposeCurve" }, - { - "first_introduced": "12", - "name": "OH_ArkUI_NodeEvent_GetNumberValue" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_NodeEvent_GetStringValue" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_NodeEvent_SetReturnNumberValue" - }, { "first_introduced": "12", "name": "OH_ArkUI_CreateOpacityTransitionEffect" @@ -2387,18 +2387,6 @@ "first_introduced": "12", "name": "OH_ArkUI_SystemFontStyleEvent_GetFontWeightScale" }, - { - "first_introduced": "12", - "name": "OH_ArkUI_DialogDismissEvent_SetShouldBlockDismiss" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_DialogDismissEvent_GetUserData" - }, - { - "first_introduced": "12", - "name": "OH_ArkUI_DialogDismissEvent_GetDismissReason" - }, { "first_introduced": "12", "name": "OH_ArkUI_NodeCustomEvent_GetCustomSpanMeasureInfo" @@ -2463,6 +2451,18 @@ "first_introduced": "12", "name": "OH_ArkUI_CustomSpanDrawInfo_GetBaseline" }, + { + "first_introduced": "12", + "name": "OH_ArkUI_DialogDismissEvent_SetShouldBlockDismiss" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_DialogDismissEvent_GetUserData" + }, + { + "first_introduced": "12", + "name": "OH_ArkUI_DialogDismissEvent_GetDismissReason" + }, { "first_introduced": "13", "name": "OH_ArkUI_AccessibilityProviderRegisterCallback" @@ -2759,10 +2759,46 @@ "first_introduced": "15", "name": "OH_ArkUI_AccessibilityProviderRegisterCallbackWithInstance" }, + { + "first_introduced": "15", + "name": "OH_ArkUI_KeyEvent_Dispatch" + }, + { + "first_introduced": "18", + "name": "OH_ArkUI_PostFrameCallback" + }, + { + "first_introduced": "15", + "name": "OH_ArkUI_NodeEvent_GetTextChangeEvent" + }, { "first_introduced": "15", "name": "OH_ArkUI_PointerEvent_GetChangedPointerId" }, + { + "first_introduced": "19", + "name": "OH_ArkUI_DragEvent_RequestDragEndPending" + }, + { + "first_introduced": "19", + "name": "OH_ArkUI_NotifyDragResult" + }, + { + "first_introduced": "19", + "name": "OH_ArkUI_NotifyDragEndPendingDone" + }, + { + "first_introduced": "20", + "name": "OH_ArkUI_EnableDropDisallowedBadge" + }, + { + "first_introduced": "20", + "name": "OH_ArkUI_DragEvent_SetDataLoadParams" + }, + { + "first_introduced": "20", + "name": "OH_ArkUI_DragAction_SetDataLoadParams" + }, { "first_introduced": "18", "name": "OH_ArkUI_GetGestureParam_FingerCount" @@ -2801,111 +2837,87 @@ }, { "first_introduced": "15", - "name": "OH_ArkUI_KeyEvent_Dispatch" - }, - { - "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_Create" - }, - { - "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_Destroy" - }, - { - "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_SetScanEffectEnabled" - }, - { - "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_SetSmoothEffectEnabled" + "name": "OH_ArkUI_RegisterLayoutCallbackOnNodeHandle" }, { "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_SetStrokeWidth" + "name": "OH_ArkUI_RegisterDrawCallbackOnNodeHandle" }, { "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_SetStrokeRadius" + "name": "OH_ArkUI_UnregisterLayoutCallbackOnNodeHandle" }, { "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_GetScanEffectEnabled" + "name": "OH_ArkUI_UnregisterDrawCallbackOnNodeHandle" }, { "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_GetSmoothEffectEnabled" + "name": "OH_ArkUI_FocusRequest" }, { "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_GetStrokeWidth" + "name": "OH_ArkUI_FocusClear" }, { "first_introduced": "15", - "name": "OH_ArkUI_ProgressLinearStyleOption_GetStrokeRadius" + "name": "OH_ArkUI_FocusActivate" }, { "first_introduced": "15", - "name": "OH_ArkUI_NodeEvent_GetTextChangeEvent" - }, - { - "first_introduced": "18", - "name": "OH_ArkUI_PostFrameCallback" - }, - { - "first_introduced": "20", - "name": "OH_ArkUI_PostIdleCallback" + "name": "OH_ArkUI_FocusSetAutoTransfer" }, { "first_introduced": "15", - "name": "OH_ArkUI_HostWindowInfo_GetName" + "name": "OH_ArkUI_ProgressLinearStyleOption_Create" }, { "first_introduced": "15", - "name": "OH_ArkUI_HostWindowInfo_Destroy" + "name": "OH_ArkUI_ProgressLinearStyleOption_Destroy" }, { "first_introduced": "15", - "name": "OH_ArkUI_RegisterLayoutCallbackOnNodeHandle" + "name": "OH_ArkUI_ProgressLinearStyleOption_SetScanEffectEnabled" }, { "first_introduced": "15", - "name": "OH_ArkUI_RegisterDrawCallbackOnNodeHandle" + "name": "OH_ArkUI_ProgressLinearStyleOption_SetSmoothEffectEnabled" }, { "first_introduced": "15", - "name": "OH_ArkUI_UnregisterLayoutCallbackOnNodeHandle" + "name": "OH_ArkUI_ProgressLinearStyleOption_SetStrokeWidth" }, { "first_introduced": "15", - "name": "OH_ArkUI_UnregisterDrawCallbackOnNodeHandle" + "name": "OH_ArkUI_ProgressLinearStyleOption_SetStrokeRadius" }, { "first_introduced": "15", - "name": "OH_ArkUI_DragEvent_StartDataLoading" + "name": "OH_ArkUI_ProgressLinearStyleOption_GetScanEffectEnabled" }, { "first_introduced": "15", - "name": "OH_ArkUI_CancelDataLoading" + "name": "OH_ArkUI_ProgressLinearStyleOption_GetSmoothEffectEnabled" }, { "first_introduced": "15", - "name": "OH_ArkUI_DisableDropDataPrefetchOnNode" + "name": "OH_ArkUI_ProgressLinearStyleOption_GetStrokeWidth" }, { "first_introduced": "15", - "name": "OH_ArkUI_FocusRequest" + "name": "OH_ArkUI_ProgressLinearStyleOption_GetStrokeRadius" }, { - "first_introduced": "15", - "name": "OH_ArkUI_FocusClear" + "first_introduced": "20", + "name": "OH_ArkUI_PostIdleCallback" }, { "first_introduced": "15", - "name": "OH_ArkUI_FocusActivate" + "name": "OH_ArkUI_HostWindowInfo_GetName" }, { "first_introduced": "15", - "name": "OH_ArkUI_FocusSetAutoTransfer" + "name": "OH_ArkUI_HostWindowInfo_Destroy" }, { "first_introduced": "15", @@ -2943,6 +2955,14 @@ "first_introduced": "15", "name": "OH_ArkUI_UIInputEvent_GetTargetDisplayId" }, + { + "first_introduced": "18", + "name": "OH_ArkUI_GestureInterrupter_GetUserData" + }, + { + "first_introduced": "15", + "name": "OH_ArkUI_FocusSetKeyProcessingMode" + }, { "first_introduced": "18", "name": "OH_ArkUI_XComponent_StartImageAnalyzer" @@ -2959,6 +2979,14 @@ "first_introduced": "19", "name": "OH_ArkUI_KeyframeAnimateOption_GetExpectedFrameRate" }, + { + "first_introduced": "15", + "name": "OH_ArkUI_DragEvent_StartDataLoading" + }, + { + "first_introduced": "15", + "name": "OH_ArkUI_CancelDataLoading" + }, { "first_introduced": "17", "name": "OH_ArkUI_VisibleAreaEventOptions_Create" @@ -2984,112 +3012,84 @@ "name": "OH_ArkUI_VisibleAreaEventOptions_GetExpectedUpdateInterval" }, { - "first_introduced": "17", - "name": "OH_ArkUI_UIInputEvent_GetEventTargetWidth" - }, - { - "first_introduced": "17", - "name": "OH_ArkUI_UIInputEvent_GetEventTargetHeight" - }, - { - "first_introduced": "17", - "name": "OH_ArkUI_UIInputEvent_GetEventTargetPositionX" - }, - { - "first_introduced": "17", - "name": "OH_ArkUI_UIInputEvent_GetEventTargetPositionY" - }, - { - "first_introduced": "17", - "name": "OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionX" - }, - { - "first_introduced": "17", - "name": "OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionY" - }, - { - "first_introduced": "17", - "name": "OH_ArkUI_HoverEvent_IsHovered" + "first_introduced": "15", + "name": "OH_ArkUI_DisableDropDataPrefetchOnNode" }, { - "first_introduced": "17", - "name": "OH_ArkUI_UIInputEvent_GetModifierKeyStates" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_CreateClonedEvent" }, { - "first_introduced": "17", - "name": "OH_ArkUI_AxisEvent_SetPropagation" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_DestroyClonedEvent" }, { - "first_introduced": "17", - "name": "OH_ArkUI_AxisEvent_GetScrollStep" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPosition" }, { - "first_introduced": "19", - "name": "OH_ArkUI_DragEvent_RequestDragEndPending" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPositionByIndex" }, { - "first_introduced": "19", - "name": "OH_ArkUI_NotifyDragResult" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_SetClonedEventActionType" }, { - "first_introduced": "19", - "name": "OH_ArkUI_NotifyDragEndPendingDone" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_SetClonedEventChangedFingerId" }, { - "first_introduced": "20", - "name": "OH_ArkUI_EnableDropDisallowedBadge" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_SetClonedEventFingerIdByIndex" }, { - "first_introduced": "20", - "name": "OH_ArkUI_DragEvent_SetDataLoadParams" - }, - { - "first_introduced": "20", - "name": "OH_ArkUI_DragAction_SetDataLoadParams" + "first_introduced": "15", + "name": "OH_ArkUI_PointerEvent_PostClonedEvent" }, { - "first_introduced": "18", - "name": "OH_ArkUI_GestureInterrupter_GetUserData" + "first_introduced": "15", + "name": "OH_ArkUI_NodeUtils_GetPositionToParent" }, { - "first_introduced": "15", - "name": "OH_ArkUI_FocusSetKeyProcessingMode" + "first_introduced": "17", + "name": "OH_ArkUI_UIInputEvent_GetEventTargetWidth" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_CreateClonedEvent" + "first_introduced": "17", + "name": "OH_ArkUI_UIInputEvent_GetEventTargetHeight" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_DestroyClonedEvent" + "first_introduced": "17", + "name": "OH_ArkUI_UIInputEvent_GetEventTargetPositionX" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPosition" + "first_introduced": "17", + "name": "OH_ArkUI_UIInputEvent_GetEventTargetPositionY" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPositionByIndex" + "first_introduced": "17", + "name": "OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionX" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_SetClonedEventActionType" + "first_introduced": "17", + "name": "OH_ArkUI_UIInputEvent_GetEventTargetGlobalPositionY" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_SetClonedEventChangedFingerId" + "first_introduced": "17", + "name": "OH_ArkUI_HoverEvent_IsHovered" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_SetClonedEventFingerIdByIndex" + "first_introduced": "17", + "name": "OH_ArkUI_UIInputEvent_GetModifierKeyStates" }, { - "first_introduced": "15", - "name": "OH_ArkUI_PointerEvent_PostClonedEvent" + "first_introduced": "17", + "name": "OH_ArkUI_AxisEvent_SetPropagation" }, { - "first_introduced": "15", - "name": "OH_ArkUI_NodeUtils_GetPositionToParent" + "first_introduced": "17", + "name": "OH_ArkUI_AxisEvent_GetScrollStep" }, { "first_introduced": "19", @@ -3323,6 +3323,14 @@ "first_introduced": "19", "name": "OH_ArkUI_XComponent_IsInitialized" }, + { + "first_introduced": "19", + "name": "OH_ArkUI_PanGesture_SetDistanceMap" + }, + { + "first_introduced": "19", + "name": "OH_ArkUI_PanGesture_GetDistanceByToolType" + }, { "first_introduced": "19", "name": "OH_ArkUI_KeyEvent_IsNumLockOn" @@ -3336,12 +3344,12 @@ "name": "OH_ArkUI_KeyEvent_IsScrollLockOn" }, { - "first_introduced": "19", - "name": "OH_ArkUI_PanGesture_SetDistanceMap" + "first_introduced": "20", + "name": "OH_ArkUI_AddSupportedUIStates" }, { - "first_introduced": "19", - "name": "OH_ArkUI_PanGesture_GetDistanceByToolType" + "first_introduced": "20", + "name": "OH_ArkUI_RemoveSupportedUIStates" }, { "first_introduced": "20", @@ -3365,19 +3373,19 @@ }, { "first_introduced": "20", - "name": "OH_ArkUI_AddSupportedUIStates" + "name": "OH_ArkUI_DragEvent_GetDragSource" }, { "first_introduced": "20", - "name": "OH_ArkUI_RemoveSupportedUIStates" + "name": "OH_ArkUI_DragEvent_IsRemote" }, { "first_introduced": "20", - "name": "OH_ArkUI_DragEvent_GetDragSource" + "name": "OH_ArkUI_PreventGestureRecognizerBegin" }, { "first_introduced": "20", - "name": "OH_ArkUI_DragEvent_IsRemote" + "name": "OH_ArkUI_SetTouchTestDoneCallback" }, { "first_introduced": "20", @@ -3427,6 +3435,14 @@ "first_introduced": "20", "name": "OH_ArkUI_AccessibilityProvider_Dispose" }, + { + "first_introduced": "20", + "name": "OH_ArkUI_InitModuleForArkTSEnv" + }, + { + "first_introduced": "20", + "name": "OH_ArkUI_NotifyArkTSEnvDestroy" + }, { "first_introduced": "20", "name": "OH_ArkUI_SurfaceCallback_SetSurfaceShowEvent" @@ -3467,14 +3483,6 @@ "first_introduced": "20", "name": "OH_ArkUI_NodeUtils_GetLayoutPositionInGlobalDisplay" }, - { - "first_introduced": "20", - "name": "OH_ArkUI_InitModuleForArkTSEnv" - }, - { - "first_introduced": "20", - "name": "OH_ArkUI_NotifyArkTSEnvDestroy" - }, { "first_introduced": "20", "name": "OH_ArkUI_SurfaceCallback_SetSurfaceHideEvent" @@ -3491,14 +3499,6 @@ "first_introduced": "20", "name": "OH_ArkUI_NodeUtils_GetNodeUniqueId" }, - { - "first_introduced": "20", - "name": "OH_ArkUI_PreventGestureRecognizerBegin" - }, - { - "first_introduced": "20", - "name": "OH_ArkUI_SetTouchTestDoneCallback" - }, { "first_introduced": "20", "name": "OH_ArkUI_SetForceDarkConfig" -- Gitee From 6367a61bd5403b195d33452d5c0080d0f2109709 Mon Sep 17 00:00:00 2001 From: wanglili12 Date: Wed, 27 Aug 2025 21:41:33 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanglili12 --- arkui/ace_engine/native/native_node_napi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/ace_engine/native/native_node_napi.h b/arkui/ace_engine/native/native_node_napi.h index 44642ac10df..3742bee384b 100644 --- a/arkui/ace_engine/native/native_node_napi.h +++ b/arkui/ace_engine/native/native_node_napi.h @@ -412,7 +412,7 @@ void OH_ArkUI_NotifyArkTSEnvDestroy(napi_env env); * Returns {@link ARKUI_ERROR_CODE_CALLBACK_INVALID} if the callback function is invalid. * @since 20 */ - int32_t OH_ArkUI_PostIdleCallback(ArkUI_ContextHandle uiContext, void* userData, +int32_t OH_ArkUI_PostIdleCallback(ArkUI_ContextHandle uiContext, void* userData, void (*callback)(uint64_t nanoTimeLeft, uint32_t frameCount, void* userData)); #ifdef __cplusplus -- Gitee From ae6c49d7b441bb7ce75ef2d40c81f02a05a328b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=9C=E7=A7=8B=E5=AE=8F?= Date: Wed, 27 Aug 2025 21:45:16 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 潜秋宏 --- arkui/ace_engine/native/drag_and_drop.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index 15f4de62140..68865dfbdf7 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -467,8 +467,8 @@ float OH_ArkUI_DragEvent_GetVelocity(ArkUI_DragEvent* event); * @brief Obtains the pressed status of modifier keys from a drag event. * * @param event Indicates the pointer to an ArkUI_DragEvent object. - * @param keys {@link ArkUI_ModifierKeyName} Indicates the returned combination of modifier keys that are currently pressed. - * The application can determine the pressed modifier keys through bitwise operations. + * @param keys {@link ArkUI_ModifierKeyName} Indicates the returned combination of modifier keys that are + * currently pressed. The application can determine the pressed modifier keys through bitwise operations. * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. @@ -499,7 +499,6 @@ ArkUI_ErrorCode OH_ArkUI_DragEvent_GetDisplayId(ArkUI_DragEvent *event, int32_t * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_DRAG_DATA_SYNC_FAILED} if the data sync is not allowed or failed. * @since 15 */ int32_t OH_ArkUI_DragEvent_StartDataLoading( @@ -968,7 +967,6 @@ int32_t OH_ArkUI_NotifyDragEndPendingDone(int32_t requestIdentify); * to pass a character array for receiving the string and explicitly specify the array length. It is * recommended that the array length be no less than 128 characters. If the length cannot accommodate * the actual bundle name length, the ERROR result will be returned. - * * @param event Indicates the pointer to an ArkUI_DragEvent object. * @param bundleName A string array used to receive the source application's bundle name. * @param length Use this to explicitly specify the length of the incoming string array. -- Gitee From 2260f4b045df3f94d3ec615e6d304d55be96797e Mon Sep 17 00:00:00 2001 From: wangyang2022 Date: Thu, 28 Aug 2025 03:13:14 +0000 Subject: [PATCH 14/22] =?UTF-8?q?=E5=9B=9E=E9=80=80capi=E5=B9=B6=E8=A1=8C?= =?UTF-8?q?=E5=8C=96API=20Signed-off-by:=20wangyang2022=20=20Change-Id:=20I1b2f80a006380bec64d40b23f988e3f48c8d64?= =?UTF-8?q?a8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arkui/ace_engine/native/libace.ndk.json | 12 ------- arkui/ace_engine/native/native_interface.h | 6 ---- arkui/ace_engine/native/native_node.h | 40 ---------------------- arkui/ace_engine/native/native_type.h | 5 --- 4 files changed, 63 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 3c739a283d0..c80fb73134e 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -4050,17 +4050,5 @@ { "first_introduced": "20", "name": "OH_ArkUI_RenderNodeUtils_DisposeRenderNodeClipOption" - }, - { - "first_introduced": "20", - "name": "OH_ArkUI_PostAsyncUITask" - }, - { - "first_introduced": "20", - "name": "OH_ArkUI_PostUITask" - }, - { - "first_introduced": "20", - "name": "OH_ArkUI_PostUITaskAndWait" } ] \ No newline at end of file diff --git a/arkui/ace_engine/native/native_interface.h b/arkui/ace_engine/native/native_interface.h index 4c340577951..64cae7e06ea 100644 --- a/arkui/ace_engine/native/native_interface.h +++ b/arkui/ace_engine/native/native_interface.h @@ -57,12 +57,6 @@ typedef enum { ARKUI_NATIVE_GESTURE, /** API related to animations. For details, see the struct definition in .*/ ARKUI_NATIVE_ANIMATE, - /** - * API related to supported multi thread UI components. - * For details, see the struct definition in . - * @since 20 - */ - ARKUI_MULTI_THREAD_NATIVE_NODE, } ArkUI_NativeAPIVariantKind; /** diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 5feb3bc7bb8..07a9708d9ff 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -10000,46 +10000,6 @@ int32_t OH_ArkUI_NodeUtils_GetNodeUniqueId(ArkUI_NodeHandle node, int32_t* uniqu int32_t OH_ArkUI_SetForceDarkConfig(ArkUI_ContextHandle uiContext, bool forceDark, ArkUI_NodeType nodeType, uint32_t (*colorInvertFunc)(uint32_t color)); -/** - * @brief Post UI task to background threads. - * - * @param context UIContext pointer of the page where the UI task located. - * @param asyncUITaskData Parameter of asyncUITask and onFinish. - * @param asyncUITask Function executed by a background thread. - * @param onFinish Function executed by UI thread after async UI task is executed. - * @return Returns the result code. - * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. - * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if context or asyncUITask is nullptr. - * @since 20 - */ -int32_t OH_ArkUI_PostAsyncUITask(ArkUI_ContextHandle context, void* asyncUITaskData, - void (*asyncUITask)(void* asyncUITaskData), void (*onFinish)(void* asyncUITaskData)); - -/** - * @brief Post UI task to UI thread. - * - * @param context UIContext pointer of the page where the UI task located. - * @param taskData Parameter of task. - * @param task Function executed by UI thread. - * @return Returns the result code. - * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. - * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if context or task is nullptr. - * @since 20 - */ -int32_t OH_ArkUI_PostUITask(ArkUI_ContextHandle context, void* taskData, void (*task)(void* taskData)); - -/** - * @brief Post UI task to UI thread and wait until UI task finished. - * - * @param context UIContext pointer of the page where the UI task located. - * @param taskData Parameter of task. - * @param task Function executed by UI thread. - * @return Returns the result code. - * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. - * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if context or task is nullptr. - * @since 20 - */ -int32_t OH_ArkUI_PostUITaskAndWait(ArkUI_ContextHandle context, void* taskData, void (*task)(void* taskData)); #ifdef __cplusplus }; #endif diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 3bfa0c36dc2..5898260f8d5 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -2266,11 +2266,6 @@ typedef enum { * @since 15 */ ARKUI_ERROR_CODE_NODE_NOT_ON_MAIN_TREE = 106203, - /** - * @error The node is running on invalid thread. - * @since 20 - */ - ARKUI_ERROR_CODE_NODE_ON_INVALID_THREAD = 106204, /** * @error Force dark config is invalid. * @since 20 -- Gitee From 2ed7db7e8d3c2f840deebed5e6dd411e9c8555e7 Mon Sep 17 00:00:00 2001 From: lizeqiang Date: Sat, 30 Aug 2025 18:31:00 +0800 Subject: [PATCH 15/22] dual core api sync Signed-off-by: lizeqiang --- .../interfaces/native/libohweb.ndk.json | 8 +++ .../native/native_interface_arkweb.h | 52 +++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/web/webview/interfaces/native/libohweb.ndk.json b/web/webview/interfaces/native/libohweb.ndk.json index c86a02925aa..1cdb08fd6a8 100644 --- a/web/webview/interfaces/native/libohweb.ndk.json +++ b/web/webview/interfaces/native/libohweb.ndk.json @@ -366,5 +366,13 @@ { "first_introduced": "20", "name": "OH_ArkWebResourceHandler_DidFailWithErrorV2" + }, + { + "first_introduced": "20", + "name": "OH_NativeArkWeb_SetActiveWebEngineVersion" + }, + { + "first_introduced": "20", + "name": "OH_NativeArkWeb_GetActiveWebEngineVersion" } ] diff --git a/web/webview/interfaces/native/native_interface_arkweb.h b/web/webview/interfaces/native/native_interface_arkweb.h index 10332371c25..122d0c50bb4 100644 --- a/web/webview/interfaces/native/native_interface_arkweb.h +++ b/web/webview/interfaces/native/native_interface_arkweb.h @@ -93,6 +93,34 @@ typedef struct { int32_t loadingTime; } ArkWeb_BlanklessInfo; +/** + * @brief ArkWeb Engine Version. + * + * ArkWeb Dual Web Engine Versioning Convention: + *

See [ArkWeb Dual Web Engine Versioning Convention] for switching between Legacy and Evergreen Web Engine. + * + * @since 20 + */ +typedef enum { + /** + * the system default ArkWeb engine. + * @since 20 + */ + SYSTEM_DEFAULT = 0, + + /** + * ArkWeb M114 version. + * @since 20 + */ + ARKWEB_M114 = 1, + + /** + * ArkWeb M132 version. + * @since 20 + */ + ARKWEB_M132 = 2, +} ArkWebEngineVersion; + /** * @brief Loads a piece of code and execute JS code in the context of the currently displayed page. * @@ -315,6 +343,30 @@ ArkWeb_ErrorCode OH_ArkWebCookieManager_SaveCookieSync(); */ void OH_ArkWebCookieManager_SaveCookieAsync(OH_ArkWeb_OnCookieSaveCallback callback); +/** + * Set active ArkWeb engine version. + * If the system does not support the specified version, it will not take effect. + * + * This is a global static API that must be called before initializeWebEngine, and it will have no effect if any + * Web components are loaded. + * + * Legacy Web Engine Compatibility Note: + *

When using legacy ArkWeb Engine, some ArkWeb newly created API will not take effect,
+ * see [Compatible with Legacy Web Engine in release note] for compatibility guidelines. + *

+ * + * @param { ArkWebEngineVersion } webEngineVersion - the ArkWebEngineVersion + * @since 20 + */ +void OH_NativeArkWeb_SetActiveWebEngineVersion(ArkWebEngineVersion webEngineVersion); + +/** + * Get currently active ArkWeb engine version. + * @return { ArkWebEngineVersion } Active ArkWeb Engine version as defined by ArkWebEngineVersion + * @since 20 + */ +ArkWebEngineVersion OH_NativeArkWeb_GetActiveWebEngineVersion(); + #ifdef __cplusplus }; #endif -- Gitee From 96ee4c40b40e67801d5c0fc75f56445f4f0c9afe Mon Sep 17 00:00:00 2001 From: zzz701 Date: Mon, 1 Sep 2025 13:57:44 +0800 Subject: [PATCH 16/22] =?UTF-8?q?NDK=E6=89=93=E5=8C=85=E8=A3=81=E5=89=AA1.?= =?UTF-8?q?2=E6=8E=A5=E5=8F=A3=20Signed-off-by:=20zzz701=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-tools/clean_ndk_ani.py | 128 +++++++++++++++++++++++++++++++ build-tools/clean_ndk_ani.pydeps | 10 +++ 2 files changed, 138 insertions(+) create mode 100755 build-tools/clean_ndk_ani.py create mode 100644 build-tools/clean_ndk_ani.pydeps diff --git a/build-tools/clean_ndk_ani.py b/build-tools/clean_ndk_ani.py new file mode 100755 index 00000000000..f28647ffbda --- /dev/null +++ b/build-tools/clean_ndk_ani.py @@ -0,0 +1,128 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import re +import argparse +import shutil +import json +import stat +from typing import List + +# ani header file list +_ANI_HEADER_LISTS = [ +] + +# Precompiled regular expression +_HEADER_PATTERN = re.compile( + r'^\s*#\s*include\s+["<](.*/)?({})[">]'.format( + '|'.join(map(re.escape, _ANI_HEADER_LISTS)) + ) +) + + +def process_header_file(file_path): + """processing single header file""" + modified = False + try: + with open(file_path, 'r+', encoding='utf-8') as f: + content = f.read() + # Use a regular expression to process all rows at once + new_content = [] + for line in content.splitlines(): + if not _HEADER_PATTERN.match(line): + new_content.append(line) + else: + modified = True + + if modified: + f.seek(0) + f.write('\n'.join(new_content)) + f.truncate() + except Exception as e: + print(f"process file {file_path} failed: {str(e)}") + return modified + + +def clean_ndk_ani_headers(ndk_header_path): + if not _ANI_HEADER_LISTS: + print("Warning: ani header file list") + return + + # all files to be processed + file_paths = [] + for root, _, files in os.walk(ndk_header_path): + for file in files: + if not file.endswith('.h'): + continue + + file_path = os.path.join(root, file) + if file in _ANI_HEADER_LISTS: + try: + os.remove(file_path) + print(f"Deleted ani header file: {file_path}") + except OSError as e: + print(f"Error deleting {file_path}: {str(e)}") + else: + file_paths.append(file_path) + + # Bulk processing file include + for file_path in file_paths: + process_header_file(file_path) + + +# Clear the ani header file in the systemCapability configuration json file +def clean_json_systemCapability_headers(capability_header_path): + try: + with open(capability_header_path, 'r') as f: + systemCapabilitys = json.load(f) + except Exception as e: + print(f"Error reading JSON file: {str(e)}") + return + + # Traverse all levels of items + for _systemCapability in systemCapabilitys: + # filtering ani header file + systemCapabilitys[_systemCapability] = [item for item in systemCapabilitys[_systemCapability] + if os.path.basename(item) not in _ANI_HEADER_LISTS] + + # Saving the modified JSON + try: + fd = os.open(capability_header_path, os.O_WRONLY | os.O_TRUNC | os.O_CREAT, + stat.S_IRUSR | stat.S_IWUSR) + with os.fdopen(fd, 'w') as f: + json.dump(systemCapabilitys, f, indent=2) + print("JSON file updated successfully") + except Exception as e: + print(f"Error saving JSON file: {str(e)}") + + +def main(): + parser = argparse.ArgumentParser() + parser.add_argument('--ndk-header-path', help='ndk header path', required=True) + parser.add_argument('--system-capability-header-config', required=True) + args = parser.parse_args() + + if not os.path.isdir(args.ndk_header_path): + print(f"Error：path {args.ndk_header_path} is not exist!") + return + + clean_ndk_ani_headers(args.ndk_header_path) + clean_json_systemCapability_headers(args.system_capability_header_config) + print("Ani Header file cleanup complete!") + + +if __name__ == '__main__': + main() diff --git a/build-tools/clean_ndk_ani.pydeps b/build-tools/clean_ndk_ani.pydeps new file mode 100644 index 00000000000..9ec5fde3fcc --- /dev/null +++ b/build-tools/clean_ndk_ani.pydeps @@ -0,0 +1,10 @@ +# Generated by running: +# build/print_python_deps.py --root build/ohos/ndk --output interface/sdk_c/build-tools/clean_ndk_ani.pydeps interface/sdk_c/build-tools/clean_ndk_ani.py +../../../build/gn_helpers.py +../../../build/scripts/__init__.py +../../../build/scripts/interface_mgr.py +../../../build/scripts/util/__init__.py +../../../build/scripts/util/build_utils.py +../../../build/scripts/util/md5_check.py +../../../build/scripts/util/pycache.py +clean_ndk_ani.py -- Gitee From 2c209f9feab0f4cdb33835bbce0f80965c3ccd83 Mon Sep 17 00:00:00 2001 From: SQ Date: Mon, 1 Sep 2025 15:24:09 +0800 Subject: [PATCH 17/22] =?UTF-8?q?swiper=E6=8E=A5=E5=8F=A3=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: SQ --- arkui/ace_engine/native/native_node.h | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 07a9708d9ff..2578eb5c2da 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -7905,6 +7905,22 @@ typedef enum { */ NODE_SWIPER_EVENT_ON_CONTENT_DID_SCROLL, + /** + * @brief Defines the event triggered when content in the swiper component will scroll. + * Instructions: Before page scrolling, the ContentWillScrollCallback callback is invoked. \n \n + * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is + * {@link ArkUI_NodeComponentEvent}. \n + * {@link ArkUI_NodeComponentEvent} contains three parameters:\n + * ArkUI_NodeComponentEvent.data[0].i32: the index value of the current child page. \n + * ArkUI_NodeComponentEvent.data[1].i32: the index value of the child page that will display. \n + * ArkUI_NodeComponentEvent.data[2].f32: the sliding offset of each frame. + * Positive numbers indicating slide backward(e.g. from index=1 to index=0), negative numbers indicating + * slide forward(e.g. from index=0 to index=1). \n + * + * @since 15 + */ + NODE_SWIPER_EVENT_ON_CONTENT_WILL_SCROLL = 1001007, + /** * @brief Defines the event triggered when the selected index of the ARKUI_NODE_SWIPER changed. * @@ -7939,22 +7955,6 @@ typedef enum { */ NODE_SWIPER_EVENT_ON_UNSELECTED = 1001006, - /** - * @brief Defines the event triggered when content in the swiper component will scroll. - * Instructions: Before page scrolling, the ContentWillScrollCallback callback is invoked. \n \n - * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is - * {@link ArkUI_NodeComponentEvent}. \n - * {@link ArkUI_NodeComponentEvent} contains three parameters:\n - * ArkUI_NodeComponentEvent.data[0].i32: the index value of the current child page. \n - * ArkUI_NodeComponentEvent.data[1].i32: the index value of the child page that will display. \n - * ArkUI_NodeComponentEvent.data[2].f32: the sliding offset of each frame. - * Positive numbers indicating slide backward(e.g. from index=1 to index=0), negative numbers indicating - * slide forward(e.g. from index=0 to index=1). \n - * - * @since 15 - */ - NODE_SWIPER_EVENT_ON_CONTENT_WILL_SCROLL = 1001007, - /** * @brief Defines the ARKUI_NODE_SWIPER scroll state change event. * This event is triggered when the scroll state of the Swiper component changes during user dragging, -- Gitee From e5a1f7ea864b0cc307cd984f30684c10d1cee004 Mon Sep 17 00:00:00 2001 From: wangjunman1 Date: Mon, 18 Aug 2025 20:00:41 +0800 Subject: [PATCH 18/22] add commit for NODE_XCOMPONENT_TYPE&NODE_XCOMPONENT_SURFACE_SIZE Signed-off-by: wangjunman1 --- arkui/ace_engine/native/native_node.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 07a9708d9ff..0f6a9b9e025 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -3984,25 +3984,19 @@ typedef enum { */ NODE_XCOMPONENT_ID = MAX_NODE_SCOPE_NUM * ARKUI_NODE_XCOMPONENT, /** - * @brief Defines the type of the component. - * This attribute can be set, reset, and obtained as required through APIs. + * @brief Specifies the type of the XComponent component. This attribute is read-only. \n + * The type of the XComponent component must be explicitly set during creation using {@link ARKUI_NODE_XCOMPONENT} or {@link ARKUI_NODE_XCOMPONENT_TEXTURE}, and cannot be modified afterward. \n + * Attempting to change the type through {@link setAttribute} will cause rendering exceptions. * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: type {@link ArkUI_XComponentType}. The default value is ARKUI_XCOMPONENT_TYPE_SURFACE. \n - * \n * Format of the return value {@link ArkUI_AttributeItem}:\n * .value[0].i32: type {@link ArkUI_XComponentType}. \n * */ NODE_XCOMPONENT_TYPE, /** - * @brief Defines the width and height of the component. - * This attribute can be set and obtained as required through APIs. + * @brief Specifies the size of the XComponent component. This attribute is read-only. \n + * Attempting to modify the size through {@link setAttribute} will have no effect. * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].u32: width, in px. \n - * .value[1].u32: height, in px. \n - * \n * Format of the return value {@link ArkUI_AttributeItem}:\n * .value[0].u32: width, in px. \n * .value[1].u32: height, in px. \n -- Gitee From 8a052f2ee9d2fb957545ada627292e90ad0d1e69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=9C=E7=A7=8B=E5=AE=8F?= Date: Mon, 1 Sep 2025 16:27:29 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BA=A4=E6=8D=A2+?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 潜秋宏 --- arkui/ace_engine/native/ui_input_event.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arkui/ace_engine/native/ui_input_event.h b/arkui/ace_engine/native/ui_input_event.h index a13728fe50d..b024f4bdf93 100644 --- a/arkui/ace_engine/native/ui_input_event.h +++ b/arkui/ace_engine/native/ui_input_event.h @@ -36,9 +36,9 @@ #ifndef _ARKUI_UI_INPUT_EVENT_H_ #define _ARKUI_UI_INPUT_EVENT_H_ -#include "native_type.h" #include +#include "native_type.h" #ifdef __cplusplus extern "C" { #endif @@ -429,7 +429,7 @@ float OH_ArkUI_PointerEvent_GetXByIndex(const ArkUI_UIInputEvent* event, uint32_ * * @param event Indicates the pointer to the UI input event. * @return Returns the Y coordinate relative to the upper left corner of the current component; - * returns 0 if any parameter error occurs. + * returns 0.0 if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetY(const ArkUI_UIInputEvent* event); @@ -453,7 +453,7 @@ float OH_ArkUI_PointerEvent_GetYByIndex(const ArkUI_UIInputEvent* event, uint32_ * * @param event Indicates the pointer to the UI input event. * @return Returns the X coordinate relative to the upper left corner of the current application window; - * returns 0 if any parameter error occurs. + * returns 0.0 if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetWindowX(const ArkUI_UIInputEvent* event); @@ -477,7 +477,7 @@ float OH_ArkUI_PointerEvent_GetWindowXByIndex(const ArkUI_UIInputEvent* event, u * * @param event Indicates the pointer to the UI input event. * @return Returns the Y coordinate relative to the upper left corner of the current application window; - * returns 0 if any parameter error occurs. + * returns 0.0 if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetWindowY(const ArkUI_UIInputEvent* event); @@ -501,7 +501,7 @@ float OH_ArkUI_PointerEvent_GetWindowYByIndex(const ArkUI_UIInputEvent* event, u * * @param event Indicates the pointer to the UI input event. * @return Returns the X coordinate relative to the upper left corner of the current screen; - * returns 0 if any parameter error occurs. + * returns 0.0 if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetDisplayX(const ArkUI_UIInputEvent* event); @@ -525,7 +525,7 @@ float OH_ArkUI_PointerEvent_GetDisplayXByIndex(const ArkUI_UIInputEvent* event, * * @param event Indicates the pointer to the UI input event. * @return Returns the Y coordinate relative to the upper left corner of the current screen; - * returns 0 if any parameter error occurs. + * returns 0.0 if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetDisplayY(const ArkUI_UIInputEvent* event); @@ -666,8 +666,9 @@ float OH_ArkUI_PointerEvent_GetTouchAreaHeight(const ArkUI_UIInputEvent* event, * @brief Checks whether an event is triggered by the user's left or right hand. * This API is only effective on some touch devices. * - * @note The value is not available immediately upon press. Until the system infers the result, this API will return - * NONE. Do not rely on the return value for critical functionality. + * @note This value cannot be obtained in real time when pressed. Before the + * system completes result inference, it will return NONE by default. Therefore, + * please do not over-rely on the results returned by this interface. * * @param event Pointer to the current UI input event. * @param hand Whether the touch point is from the left or right hand. @@ -682,8 +683,9 @@ int32_t OH_ArkUI_PointerEvent_GetInteractionHand(const ArkUI_UIInputEvent *event * @brief Checks whether an event is triggered by the user's left or right hand. * This API is only effective on some touch devices. * - * @note The value is not available immediately upon press. Until the system infers the result, - * this API will return NONE. Do not rely on the return value for critical functionality. + * @note This value cannot be obtained in real time when pressed. Before the + * system completes result inference, it will return NONE by default. Therefore, + * please do not over-rely on the results returned by this interface. * * @param event Pointer to the current UI input event. * @param pointerIndex Index of the target touch point in the multi-touch data list. -- Gitee From d95956da4b7b841908b00d9e3393eefa6bffee61 Mon Sep 17 00:00:00 2001 From: houguobiao Date: Mon, 1 Sep 2025 20:57:26 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8DDialog=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3CAPI=E5=8F=82=E6=95=B0=E6=8F=8F=E8=BF=B0=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: houguobiao Change-Id: Ia202a38c44627a14e3445d15114febaead287397 --- arkui/ace_engine/native/native_dialog.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index a59f1afcb52..5bdde7f9d1e 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -983,8 +983,7 @@ int32_t OH_ArkUI_CustomDialog_SetShadow(ArkUI_CustomDialogOptions* options, ArkU * @brief Sets the custom shadow of the dialog box background. * * @param options Dialog box parameters. - * @param customShadow Custom shadow parameter. The format is the same as that of - * the NODE_CUSTOM_SHADOW property. + * @param customShadow Custom shadow parameter. The format is the same as that of the NODE_SHADOW property. * @return Returns the error code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. -- Gitee From 6b33496697213e2827aae0c32e5af5923c357747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=9C=E7=A7=8B=E5=AE=8F?= Date: Tue, 2 Sep 2025 16:34:20 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 潜秋宏 --- arkui/ace_engine/native/ui_input_event.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arkui/ace_engine/native/ui_input_event.h b/arkui/ace_engine/native/ui_input_event.h index b024f4bdf93..f5424e8a148 100644 --- a/arkui/ace_engine/native/ui_input_event.h +++ b/arkui/ace_engine/native/ui_input_event.h @@ -61,9 +61,9 @@ typedef enum { ARKUI_UIINPUTEVENT_TYPE_AXIS = 2, /** Mouse event. */ ARKUI_UIINPUTEVENT_TYPE_MOUSE = 3, - /** + /** * @brief key event. - * + * * @since 20 */ ARKUI_UIINPUTEVENT_TYPE_KEY = 4, @@ -429,7 +429,7 @@ float OH_ArkUI_PointerEvent_GetXByIndex(const ArkUI_UIInputEvent* event, uint32_ * * @param event Indicates the pointer to the UI input event. * @return Returns the Y coordinate relative to the upper left corner of the current component; - * returns 0.0 if any parameter error occurs. + * returns 0.0f if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetY(const ArkUI_UIInputEvent* event); @@ -453,7 +453,7 @@ float OH_ArkUI_PointerEvent_GetYByIndex(const ArkUI_UIInputEvent* event, uint32_ * * @param event Indicates the pointer to the UI input event. * @return Returns the X coordinate relative to the upper left corner of the current application window; - * returns 0.0 if any parameter error occurs. + * returns 0.0f if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetWindowX(const ArkUI_UIInputEvent* event); @@ -477,7 +477,7 @@ float OH_ArkUI_PointerEvent_GetWindowXByIndex(const ArkUI_UIInputEvent* event, u * * @param event Indicates the pointer to the UI input event. * @return Returns the Y coordinate relative to the upper left corner of the current application window; - * returns 0.0 if any parameter error occurs. + * returns 0.0f if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetWindowY(const ArkUI_UIInputEvent* event); @@ -501,7 +501,7 @@ float OH_ArkUI_PointerEvent_GetWindowYByIndex(const ArkUI_UIInputEvent* event, u * * @param event Indicates the pointer to the UI input event. * @return Returns the X coordinate relative to the upper left corner of the current screen; - * returns 0.0 if any parameter error occurs. + * returns 0.0f if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetDisplayX(const ArkUI_UIInputEvent* event); @@ -525,7 +525,7 @@ float OH_ArkUI_PointerEvent_GetDisplayXByIndex(const ArkUI_UIInputEvent* event, * * @param event Indicates the pointer to the UI input event. * @return Returns the Y coordinate relative to the upper left corner of the current screen; - * returns 0.0 if any parameter error occurs. + * returns 0.0f if any parameter error occurs. * @since 12 */ float OH_ArkUI_PointerEvent_GetDisplayY(const ArkUI_UIInputEvent* event); -- Gitee From 220e349ae7f1af2a1571479c3a819242c5d0ad36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=9C=E7=A7=8B=E5=AE=8F?= Date: Thu, 11 Sep 2025 19:43:31 +0800 Subject: [PATCH 22/22] =?UTF-8?q?PointerEvent=E7=AD=89=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 潜秋宏 --- arkui/ace_engine/native/ui_input_event.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arkui/ace_engine/native/ui_input_event.h b/arkui/ace_engine/native/ui_input_event.h index f5424e8a148..4297f5facda 100644 --- a/arkui/ace_engine/native/ui_input_event.h +++ b/arkui/ace_engine/native/ui_input_event.h @@ -1275,7 +1275,7 @@ int32_t OH_ArkUI_PointerEvent_CreateClonedEvent(const ArkUI_UIInputEvent* event, * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_NON_CLONED_POINTER_EVENT} if the input event pointer is not a + * Returns {@link ARKUI_ERROR_CODE_NOT_CLONED_POINTER_EVENT} if the input event pointer is not a * cloned event pointer. * @since 15 */ @@ -1290,7 +1290,7 @@ int32_t OH_ArkUI_PointerEvent_DestroyClonedEvent(const ArkUI_UIInputEvent* event * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_NON_CLONED_POINTER_EVENT} if the input event pointer is not a + * Returns {@link ARKUI_ERROR_CODE_NOT_CLONED_POINTER_EVENT} if the input event pointer is not a * cloned event pointer. * @since 15 */ @@ -1307,7 +1307,7 @@ int32_t OH_ArkUI_PointerEvent_SetClonedEventLocalPosition(const ArkUI_UIInputEve * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_NON_CLONED_POINTER_EVENT} if the input event pointer is not a + * Returns {@link ARKUI_ERROR_CODE_NOT_CLONED_POINTER_EVENT} if the input event pointer is not a * cloned event pointer. * @since 15 */ @@ -1322,7 +1322,7 @@ int32_t OH_ArkUI_PointerEvent_SetClonedEventLocalPositionByIndex( * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_NON_CLONED_POINTER_EVENT} if the input event pointer is not a + * Returns {@link ARKUI_ERROR_CODE_NOT_CLONED_POINTER_EVENT} if the input event pointer is not a * cloned event pointer. * @since 15 */ @@ -1336,7 +1336,7 @@ int32_t OH_ArkUI_PointerEvent_SetClonedEventActionType(const ArkUI_UIInputEvent* * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_NON_CLONED_POINTER_EVENT} if the input event pointer is not a + * Returns {@link ARKUI_ERROR_CODE_NOT_CLONED_POINTER_EVENT} if the input event pointer is not a * cloned event pointer. * @since 15 */ @@ -1351,7 +1351,7 @@ int32_t OH_ArkUI_PointerEvent_SetClonedEventChangedFingerId(const ArkUI_UIInputE * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_NON_CLONED_POINTER_EVENT} if the input event pointer is not a + * Returns {@link ARKUI_ERROR_CODE_NOT_CLONED_POINTER_EVENT} if the input event pointer is not a * cloned event pointer. * @since 15 */ @@ -1366,7 +1366,7 @@ int32_t OH_ArkUI_PointerEvent_SetClonedEventFingerIdByIndex( * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_NON_CLONED_POINTER_EVENT} if the input event pointer is not a + * Returns {@link ARKUI_ERROR_CODE_NOT_CLONED_POINTER_EVENT} if the input event pointer is not a * cloned event pointer. * Returns {@link ARKUI_ERROR_CODE_POST_CLONED_COMPONENT_STATUS_ABNORMAL} * if the component status abnormal. -- Gitee