From 43f91fd7aa0fbc0eda27c070800b601c40eefc11 Mon Sep 17 00:00:00 2001 From: greensue Date: Tue, 11 Mar 2025 09:47:55 +0800 Subject: [PATCH 01/71] jit ACL: change version to 18 Signed-off-by: greensue --- ark_runtime/jsvm/jsvm_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ark_runtime/jsvm/jsvm_types.h b/ark_runtime/jsvm/jsvm_types.h index 999214b1a..8432207c5 100644 --- a/ark_runtime/jsvm/jsvm_types.h +++ b/ark_runtime/jsvm/jsvm_types.h @@ -332,7 +332,7 @@ typedef enum { */ JSVM_INVALID_TYPE, /** jit mode expected status. - * @since 15 + * @since 18 */ JSVM_JIT_MODE_EXPECTED, } JSVM_Status; -- Gitee From 6098bc50797d380072ec052dbef4e90a2eb1d046 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Tue, 1 Apr 2025 14:17:02 +0800 Subject: [PATCH 02/71] =?UTF-8?q?Dialog=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E6=A8=A1?= =?UTF-8?q?=E7=B3=8ACAPI=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang Change-Id: I4e5f326ccc05b3e4fdd41bcd83a72ae2b5423f72 --- arkui/ace_engine/native/native_dialog.h | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index bedf2c0e7..a9967b8e6 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -649,6 +649,16 @@ typedef struct { * @note This method must be called before the show method. * @param handle Indicates the pointer to the custom dialog box controller. * @param backgroundBlurStyleOptions Background blur effect options. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].i32: color mode. The value is an enum of {@link ArkUI_ColorMode}. \n + * .value[1]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[2]?.f32: blur degree. The value range is [0.0, 1.0]. \n + * .value[3]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[4]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[5]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[6]?.u32: background color, in 0xARGB format, of the components within the window after the window + * loses focus (in which case, the blur effect on the components within the window is + * removed). \n * @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. @@ -663,6 +673,18 @@ typedef struct { * @note This method must be called before the show method. * @param handle Indicates the pointer to the custom dialog box controller. * @param backgroundEffect Background effect. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].f32: blur radius, in vp. \n + * .value[1]?.f32: saturation. \n + * .value[2]?.f32: brightness. \n + * .value[3]?.u32: color, in 0xARGB format. \n + * .value[4]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[5]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[6]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[7]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[8]?.u32: background color, in 0xARGB format, of the components within the window after the window + * loses focus (in which case, the blur effect on the components within the window is + * removed). \n * @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. @@ -1119,6 +1141,15 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnDidDisappearCallback( * * @param options Dialog box parameters. * @param backgroundBlurStyleOptions Background blur effect options of the dialog box. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].i32: color mode. The value is an enum of {@link ArkUI_ColorMode}. \n + * .value[1]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[2]?.f32: blur degree. The value range is [0.0, 1.0]. \n + * .value[3]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[4]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[5]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[6]?.u32: background color, in 0xARGB format, of the components within the window after the window loses + * focus (in which case, the blur effect on the components within the window is removed). \n * @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. @@ -1132,6 +1163,17 @@ int32_t OH_ArkUI_CustomDialog_SetBackgroundBlurStyleOptions( * * @param options Dialog box parameters. * @param backgroundEffect Background effect of the dialog box. + * Format of the {@link ArkUI_AttributeItem} parameter: \n + * .value[0].f32: blur radius, in vp. \n + * .value[1]?.f32: saturation. \n + * .value[2]?.f32: brightness. \n + * .value[3]?.u32: color, in 0xARGB format. \n + * .value[4]?.i32: adaptive color mode. The value is an enum of {@link ArkUI_AdaptiveColor}. \n + * .value[5]?.u32: brightness of black in the grayscale blur. The value range is [0, 127]. \n + * .value[6]?.u32: degree of darkening the white color in the grayscale blur. The value range is [0, 127]. \n + * .value[7]?.i32: blur activation policy. The value is an enum of {@link ArkUI_BlurStyleActivePolicy}. \n + * .value[8]?.u32: background color, in 0xARGB format, of the components within the window after the window loses + * focus (in which case, the blur effect on the components within the window is removed). \n * @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. -- Gitee From 02f811afd2aa7cac9a3d32bb1af57e4dee3ebe17 Mon Sep 17 00:00:00 2001 From: lihui Date: Thu, 17 Apr 2025 20:35:32 +0800 Subject: [PATCH 03/71] cleancache api to 19 Signed-off-by: lihui --- graphic/graphic_2d/native_window/external_window.h | 2 +- graphic/graphic_2d/native_window/libnative_window.ndk.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphic/graphic_2d/native_window/external_window.h b/graphic/graphic_2d/native_window/external_window.h index 41b01ce8d..b1fb1554f 100644 --- a/graphic/graphic_2d/native_window/external_window.h +++ b/graphic/graphic_2d/native_window/external_window.h @@ -879,7 +879,7 @@ int32_t OH_NativeWindow_GetMetadataValue(OHNativeWindow *window, OH_NativeBuffer * {@link NATIVE_ERROR_INVALID_ARGUMENTS} 40001000 - window is NULL. * {@link NATIVE_ERROR_CONSUMER_DISCONNECTED} 41211000 - the consumer is disconnected. * {@link NATIVE_ERROR_BINDER_ERROR} 50401000 - ipc send failed. - * @since 18 + * @since 19 * @version 1.0 */ int32_t OH_NativeWindow_CleanCache(OHNativeWindow *window); diff --git a/graphic/graphic_2d/native_window/libnative_window.ndk.json b/graphic/graphic_2d/native_window/libnative_window.ndk.json index ded24b2e8..e138057e8 100644 --- a/graphic/graphic_2d/native_window/libnative_window.ndk.json +++ b/graphic/graphic_2d/native_window/libnative_window.ndk.json @@ -52,7 +52,7 @@ "name": "OH_NativeWindow_GetMetadataValue" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_NativeWindow_CleanCache" } -- Gitee From b0dbafd021e83f06a19c39117d15852dac126f9a Mon Sep 17 00:00:00 2001 From: chuchihtung Date: Wed, 16 Apr 2025 00:15:50 +0800 Subject: [PATCH 04/71] add general task and queue task submission wrapper interfaces Signed-off-by: chuchihtung --- resourceschedule/ffrt/c/loop.h | 3 ++- resourceschedule/ffrt/c/queue.h | 39 ++++++++++++++++++++++++++++++ resourceschedule/ffrt/c/task.h | 42 +++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/resourceschedule/ffrt/c/loop.h b/resourceschedule/ffrt/c/loop.h index 0c5ab2a2f..35d76cedb 100644 --- a/resourceschedule/ffrt/c/loop.h +++ b/resourceschedule/ffrt/c/loop.h @@ -36,8 +36,9 @@ #ifndef FFRT_API_C_LOOP_H #define FFRT_API_C_LOOP_H -#include "queue.h" +#include #include "type_def.h" +#include "queue.h" /** * @brief Defines the loop handle, which identifies different loops. diff --git a/resourceschedule/ffrt/c/queue.h b/resourceschedule/ffrt/c/queue.h index 758b79b5a..19c87469a 100644 --- a/resourceschedule/ffrt/c/queue.h +++ b/resourceschedule/ffrt/c/queue.h @@ -194,6 +194,45 @@ FFRT_C_API void ffrt_queue_submit(ffrt_queue_t queue, ffrt_function_header_t* f, FFRT_C_API ffrt_task_handle_t ffrt_queue_submit_h( ffrt_queue_t queue, ffrt_function_header_t* f, const ffrt_task_attr_t* attr); +/** + * @brief Submits a task to a queue, simplified from of the ffrt_queue_submit interface. + * + * This interface wraps the provided task function and its argument into a task wrapper designed + * for queue submission (ffrt_function_kind_queue). The task destroy callback (after_func), which + * would normally handle any post-execution cleanup, is automatically set to NULL in this wrapper, + * thus omitting any additional cleanup actions. The resulting task wrapper is then submitted to + * the specified queue via the ffrt_queue_submit interface. + * + * @param queue Indicates a queue handle. + * @param func Indicates a task function to be executed. + * @param arg Indicates a pointer to the argument or closure data that will be passed to the task function. + * @param attr Indicates a pointer to the task attribute. + * @see ffrt_queue_submit + * @since 20 + */ +FFRT_C_API void ffrt_queue_submit_f(ffrt_queue_t queue, ffrt_function_t func, void* arg, const ffrt_task_attr_t* attr); + +/** + * @brief Submits a task to a queue, and obtains a task handle, simplified from the ffrt_queue_submit_h interface. + * + * This interface wraps the provided task function and its argument into a task wrapper designed + * for queue submission (ffrt_function_kind_queue). The task destroy callback (after_func), which + * would normally handle any post-execution cleanup, is automatically set to NULL in this wrapper, + * thus omitting any additional cleanup actions. The resulting task wrapper is then submitted to + * the specified queue via the ffrt_queue_submit_h interface. + * + * @param queue Indicates a queue handle. + * @param func Indicates a task function to be executed. + * @param arg Indicates a pointer to the argument or closure data that will be passed to the task function. + * @param attr Indicates a pointer to the task attribute. + * @return Returns a non-null task handle if the task is submitted; + returns a null pointer otherwise. + * @see ffrt_queue_submit_h + * @since 20 + */ +FFRT_C_API ffrt_task_handle_t ffrt_queue_submit_h_f( + ffrt_queue_t queue, ffrt_function_t func, void* arg, const ffrt_task_attr_t* attr); + /** * @brief Waits until a task in the queue is complete. * diff --git a/resourceschedule/ffrt/c/task.h b/resourceschedule/ffrt/c/task.h index 86df988f3..39cc6ed83 100644 --- a/resourceschedule/ffrt/c/task.h +++ b/resourceschedule/ffrt/c/task.h @@ -210,6 +210,48 @@ FFRT_C_API void ffrt_submit_base(ffrt_function_header_t* f, const ffrt_deps_t* i FFRT_C_API ffrt_task_handle_t ffrt_submit_h_base(ffrt_function_header_t* f, const ffrt_deps_t* in_deps, const ffrt_deps_t* out_deps, const ffrt_task_attr_t* attr); +/** + * @brief Submits a task, simplified from the ffrt_submit_base interface. + * + * This interface wraps the provided task function and its argument into a task wrapper + * designated as a general task (ffrt_function_kind_general). During wrapper creation, the + * task destroy callback (after_func), which is intended to handle any post-execution cleanup, + * is simplified to NULL. The resulting task wrapper is then submitted using the underlying + * ffrt_submit_base interface. + * + * @param func Indicates a task function to be executed. + * @param arg Indicates a pointer to the argument or closure data that will be passed to the task function. + * @param in_deps Indicates a pointer to the input dependencies. + * @param out_deps Indicates a pointer to the output dependencies. + * @param attr Indicates a pointer to the task attribute. + * @see ffrt_submit_base + * @since 20 + */ +FFRT_C_API void ffrt_submit_f(ffrt_function_t func, void* arg, const ffrt_deps_t* in_deps, const ffrt_deps_t* out_deps, + const ffrt_task_attr_t* attr); + +/** + * @brief Submits a task, and obtains a task handle, simplified from the ffrt_submit_h_base interface. + * + * This interface wraps the provided task function and its argument into a task wrapper + * designated as a general task (ffrt_function_kind_general). During wrapper creation, the + * task destroy callback (after_func), which is intended to handle any post-execution cleanup, + * is simplified to NULL. The resulting task wrapper is then submitted using the underlying + * ffrt_submit_h_base interface. + * + * @param func Indicates a task function to be executed. + * @param arg Indicates a pointer to the argument or closure data that will be passed to the task function. + * @param in_deps Indicates a pointer to the input dependencies. + * @param out_deps Indicates a pointer to the output dependencies. + * @param attr Indicates a pointer to the task attribute. + * @return Returns a non-null task handle if the task is submitted; + returns a null pointer otherwise. + * @see ffrt_submit_h_base + * @since 20 + */ +FFRT_C_API ffrt_task_handle_t ffrt_submit_h_f(ffrt_function_t func, void* arg, const ffrt_deps_t* in_deps, + const ffrt_deps_t* out_deps, const ffrt_task_attr_t* attr); + /** * @brief Increases reference count of a task. * -- Gitee From 753459edb5cde806e1ceeec13ba1499701775538 Mon Sep 17 00:00:00 2001 From: wangqing Date: Fri, 18 Apr 2025 11:18:24 +0800 Subject: [PATCH 05/71] adjust API18 to API19 Signed-off-by: wangqing Change-Id: Ic4ecf2928248b85e41a02c7d55d32783db3ac565 --- hiviewdfx/hitrace/include/hitrace/trace.h | 86 +++++++++++------------ hiviewdfx/hitrace/libhitrace.ndk.json | 12 ++-- 2 files changed, 47 insertions(+), 51 deletions(-) diff --git a/hiviewdfx/hitrace/include/hitrace/trace.h b/hiviewdfx/hitrace/include/hitrace/trace.h index 4dcf2c51e..c5bf7c325 100644 --- a/hiviewdfx/hitrace/include/hitrace/trace.h +++ b/hiviewdfx/hitrace/include/hitrace/trace.h @@ -40,24 +40,6 @@ * * @brief Defines APIs of the HiTraceMeter module for performance trace. * - * Sample code: \n - * Synchronous timeslice trace event: \n - * OH_HiTrace_StartTrace("hitraceTest");\n - * OH_HiTrace_FinishTrace();\n - * Output: \n - * <...>-1668 (-------) [003] .... 135.059377: tracing_mark_write: B|1668|H:hitraceTest \n - * <...>-1668 (-------) [003] .... 135.059415: tracing_mark_write: E|1668| \n - * Asynchronous timeslice trace event:\n - * OH_HiTrace_StartAsyncTrace("hitraceTest", 123); \n - * OH_HiTrace_FinishAsyncTrace("hitraceTest", 123); \n - * Output: \n - * <...>-2477 (-------) [001] .... 396.427165: tracing_mark_write: S|2477|H:hitraceTest 123 \n - * <...>-2477 (-------) [001] .... 396.427196: tracing_mark_write: F|2477|H:hitraceTest 123 \n - * Integer value trace event:\n - * OH_HiTrace_CountTrace("hitraceTest", 500); \n - * Output: \n - * <...>-2638 (-------) [002] .... 458.904382: tracing_mark_write: C|2638|H:hitraceTest 500 \n - * * @library libhitracechain.so * @syscap SystemCapability.HiviewDFX.HiTrace * @since 10 @@ -297,37 +279,49 @@ typedef enum HiTrace_Communication_Mode { * @brief Enumerates the HiTrace output levels. The output level threshold system parameter determines * the minimum output trace. * - * @since 18 + * @atomicservice + * + * @since 19 */ typedef enum HiTrace_Output_Level { /** - * @brief Ouput level only for debug usage. + * @brief Output level only for debug usage. * - * @since 18 + * @atomicservice + * + * @since 19 */ HITRACE_LEVEL_DEBUG = 0, /** - * @brief Output level for beta version usage. + * @brief Output level for log version usage. + * + * @atomicservice * - * @since 18 + * @since 19 */ HITRACE_LEVEL_INFO = 1, /** - * @brief Output level for beta version usage, with higher priority than HITRACE_LEVEL_INFO. + * @brief Output level for log version usage, with higher priority than HITRACE_LEVEL_INFO. * - * @since 18 + * @atomicservice + * + * @since 19 */ HITRACE_LEVEL_CRITICAL = 2, /** - * @brief Output level for commercial version usage. + * @brief Output level for nolog version usage. + * + * @atomicservice * - * @since 18 + * @since 19 */ HITRACE_LEVEL_COMMERCIAL = 3, /** * @brief Output level for range limit. * - * @since 18 + * @atomicservice + * + * @since 19 */ HITRACE_LEVEL_MAX = HITRACE_LEVEL_COMMERCIAL, } HiTrace_Output_Level; @@ -729,23 +723,25 @@ void OH_HiTrace_CountTrace(const char *name, int64_t count); * The OH_HiTrace_StartTraceEx and OH_HiTrace_FinishTraceEx APIs must be used in pairs. * The two APIs can be used in nested mode. The stack data structure is used for matching during trace data parsing. * - * @param level Level of output priority. - * @param name Name of a trace task. - * @param customArgs key=value pair, multiple pairs use comma as seperator. + * @param level Trace output priority level. + * @param name Name of the synchronous trace task. + * @param customArgs key=value pair, multiple pairs use comma as separator. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_StartTraceEx(HiTrace_Output_Level level, const char* name, const char* customArgs); /** * @brief Marks the end of a synchronous trace task with output level control. * - * This API must be used with OH_HiTrace_StartTraceEx in pairs. During trace data parsing, the system matches - * it with the most recent OH_HiTrace_StartTraceEx API invocation in the service process. + * This API must be used with OH_HiTrace_StartTraceEx in pairs. The two APIs, which have the same level, + * form an synchronous timeslice trace task. + * During trace data parsing, the system matches it with the most recent OH_HiTrace_StartTraceEx API + * invocation in the service process. * - * @param level Level of output priority. + * @param level Trace output priority level. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_FinishTraceEx(HiTrace_Output_Level level); @@ -764,13 +760,13 @@ void OH_HiTrace_FinishTraceEx(HiTrace_Output_Level level); * If the trace tasks with the same name are not performed at the same time, the same taskId can be used. * Different processes's taskId do not interfere. * - * @param level Level of output priority. + * @param level Trace output priority level. * @param name Name of the asynchronous trace task. * @param taskId ID of the asynchronous trace task. * @param customCategory Label used to aggregate the asynchronous trace. - * @param customArgs key=value pair, multiple pairs use comma as seperator. + * @param customArgs key=value pair, multiple pairs use comma as separator. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_StartAsyncTraceEx(HiTrace_Output_Level level, const char* name, int32_t taskId, const char* customCategory, const char* customArgs); @@ -782,11 +778,11 @@ void OH_HiTrace_StartAsyncTraceEx(HiTrace_Output_Level level, const char* name, * It is used with OH_HiTrace_StartAsyncTraceEx in pairs. Its level, name, and task ID must be * the same as those of OH_HiTrace_StartAsyncTraceEx. * - * @param level Level of output priority. + * @param level Trace output priority level. * @param name Name of the asynchronous trace task. * @param taskId ID of the asynchronous trace task. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_FinishAsyncTraceEx(HiTrace_Output_Level level, const char* name, int32_t taskId); @@ -796,11 +792,11 @@ void OH_HiTrace_FinishAsyncTraceEx(HiTrace_Output_Level level, const char* name, * This API can be executed for multiple times to trace the value change of a given integer variable at different * time points. * - * @param level Level of output priority. + * @param level Trace output priority level. * @param name Name of the integer variable. It does not need to be the same as the real variable name. * @param count Integer value. Generally, an integer variable can be passed. * @atomicservice - * @since 18 + * @since 19 */ void OH_HiTrace_CountTraceEx(HiTrace_Output_Level level, const char* name, int64_t count); @@ -809,9 +805,9 @@ void OH_HiTrace_CountTraceEx(HiTrace_Output_Level level, const char* name, int64 * * @return Returns whether the calling process is allowed to output trace. * @atomicservice - * @since 18 + * @since 19 */ -bool OH_HiTrace_IsTraceEnabled(); +bool OH_HiTrace_IsTraceEnabled(void); #ifdef __cplusplus } diff --git a/hiviewdfx/hitrace/libhitrace.ndk.json b/hiviewdfx/hitrace/libhitrace.ndk.json index ca73be360..5cf5a3451 100644 --- a/hiviewdfx/hitrace/libhitrace.ndk.json +++ b/hiviewdfx/hitrace/libhitrace.ndk.json @@ -99,27 +99,27 @@ "name": "OH_HiTrace_IdToBytes" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_StartTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_FinishTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_StartAsyncTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_FinishAsyncTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_CountTraceEx" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_HiTrace_IsTraceEnabled" } ] \ No newline at end of file -- Gitee From 188e6e0ecb30c478b46c572dfa1145f6282fec61 Mon Sep 17 00:00:00 2001 From: b30058220 Date: Thu, 24 Apr 2025 09:47:26 +0800 Subject: [PATCH 06/71] =?UTF-8?q?imageSize=E4=BF=AE=E6=94=B9=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: b30058220 --- arkui/ace_engine/native/native_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 5d4d17691..005fd0888 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -1084,7 +1084,7 @@ typedef enum { typedef enum { /** The original image aspect ratio is retained. */ ARKUI_IMAGE_SIZE_AUTO = 0, - /** Default value. The image is scaled with its aspect ratio retained for both sides to be greater than or equal + /** The image is scaled with its aspect ratio retained for both sides to be greater than or equal * to the display boundaries. */ ARKUI_IMAGE_SIZE_COVER, /** The image is scaled with its aspect ratio retained for the content to be completely displayed within the display -- Gitee From 2f1dc308c7402870acef6ce87fcfd83eb2cf9231 Mon Sep 17 00:00:00 2001 From: skye-you Date: Thu, 24 Apr 2025 15:25:01 +0800 Subject: [PATCH 07/71] add function QuerySyncResult Signed-off-by: wind --- security/asset/inc/asset_api.h | 19 +++++++++++++++++++ security/asset/inc/asset_type.h | 26 ++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/security/asset/inc/asset_api.h b/security/asset/inc/asset_api.h index cda927aac..615bf652c 100755 --- a/security/asset/inc/asset_api.h +++ b/security/asset/inc/asset_api.h @@ -203,6 +203,25 @@ int32_t OH_Asset_Query(const Asset_Attr *query, uint32_t queryCnt, Asset_ResultS */ int32_t OH_Asset_PostQuery(const Asset_Attr *handle, uint32_t handleCnt); +/** + * @brief Query the result of synchronization. + * + * @param query Pointer to the search criteria. + * @param queryCnt Number of the search criteria. + * @param syncResult Pointer to the synchronization result obtained. + * @return {@link ASSET_SUCCESS} 0 - The operation is successful. + * {@link ASSET_SERVICE_UNAVAILABLE} 24000001 - The ASSET service is unavailable. + * {@link ASSET_OUT_OF_MEMORY} 24000006 - Insufficient memory. + * {@link ASSET_IPC_ERROR} 24000010 - IPC failed. + * {@link ASSET_BMS_ERROR} 24000011 - Calling the Bundle Manager service failed. + * {@link ASSET_ACCOUNT_ERROR} 24000012 - Calling the OS Account service failed. + * {@link ASSET_ACCESS_TOKEN_ERROR} 24000013 - Calling the Access Token service failed. + * {@link ASSET_FILE_OPERATION_ERROR} 24000014 - The file operation failed. + * {@link ASSET_PARAM_VERIFICATION_FAILED} 24000018 - Parameter verification failed. + * @since 20 + */ +int32_t OH_Asset_QuerySyncResult(const Asset_Attr *query, uint32_t queryCnt, SyncResult *syncResult); + /** * @brief Parses the query result to obtain the specified attribute value. * diff --git a/security/asset/inc/asset_type.h b/security/asset/inc/asset_type.h index 1706eb602..3f369a07c 100755 --- a/security/asset/inc/asset_type.h +++ b/security/asset/inc/asset_type.h @@ -271,6 +271,12 @@ typedef enum { ASSET_LIMIT_EXCEEDED = 24000016, /** @error The capability is not supported. */ ASSET_UNSUPPORTED = 24000017, + /** + * @error Parameter verification failed. + * + * @since 20 + */ + ASSET_PARAM_VERIFICATION_FAILED = 24000018, } Asset_ResultCode; /** @@ -485,6 +491,26 @@ typedef struct { Asset_Result *results; } Asset_ResultSet; +/** + * @brief Represents information about the synchronization result. + * + * @since 20 + */ + typedef struct { + /** + * The result code of synchronization. + */ + int32_t resultCode; + /** + * The total number of synchronization. + */ + uint32_t totalNum; + /** + * The number of Assets that fail to synchronize. + */ + uint32_t failedNum; +} Asset_SyncResult; + #ifdef __cplusplus } #endif -- Gitee From 4379da2a04daed91aec87341829468a567adb4de Mon Sep 17 00:00:00 2001 From: skye-you Date: Thu, 24 Apr 2025 15:32:13 +0800 Subject: [PATCH 08/71] add json config` Signed-off-by: wind --- security/asset/libasset.ndk.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/security/asset/libasset.ndk.json b/security/asset/libasset.ndk.json index 7ea9eec44..e8acf76b3 100755 --- a/security/asset/libasset.ndk.json +++ b/security/asset/libasset.ndk.json @@ -17,6 +17,9 @@ { "name": "OH_Asset_PostQuery" }, + { + "name": "OH_Asset_QuerySyncResult" + }, { "name": "OH_Asset_ParseAttr" }, -- Gitee From 7084dbc5d4e87091039e4961bba3379316aa4aaf Mon Sep 17 00:00:00 2001 From: skye-you Date: Thu, 24 Apr 2025 16:07:36 +0800 Subject: [PATCH 09/71] correct function name Signed-off-by: wind --- security/asset/inc/asset_api.h | 2 +- security/asset/inc/asset_type.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/security/asset/inc/asset_api.h b/security/asset/inc/asset_api.h index 615bf652c..e896de82a 100755 --- a/security/asset/inc/asset_api.h +++ b/security/asset/inc/asset_api.h @@ -220,7 +220,7 @@ int32_t OH_Asset_PostQuery(const Asset_Attr *handle, uint32_t handleCnt); * {@link ASSET_PARAM_VERIFICATION_FAILED} 24000018 - Parameter verification failed. * @since 20 */ -int32_t OH_Asset_QuerySyncResult(const Asset_Attr *query, uint32_t queryCnt, SyncResult *syncResult); +int32_t OH_Asset_QuerySyncResult(const Asset_Attr *query, uint32_t queryCnt, Asset_SyncResult *syncResult); /** * @brief Parses the query result to obtain the specified attribute value. diff --git a/security/asset/inc/asset_type.h b/security/asset/inc/asset_type.h index 3f369a07c..7dec07221 100755 --- a/security/asset/inc/asset_type.h +++ b/security/asset/inc/asset_type.h @@ -496,7 +496,7 @@ typedef struct { * * @since 20 */ - typedef struct { +typedef struct { /** * The result code of synchronization. */ -- Gitee From 6672b9d094e204fbd041ca03f235485b3f1e24f2 Mon Sep 17 00:00:00 2001 From: skye-you Date: Thu, 24 Apr 2025 17:26:42 +0800 Subject: [PATCH 10/71] change number to count Signed-off-by: wind --- security/asset/inc/asset_type.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/asset/inc/asset_type.h b/security/asset/inc/asset_type.h index 7dec07221..ad90fbfdb 100755 --- a/security/asset/inc/asset_type.h +++ b/security/asset/inc/asset_type.h @@ -502,13 +502,13 @@ typedef struct { */ int32_t resultCode; /** - * The total number of synchronization. + * The total count of synchronization. */ - uint32_t totalNum; + uint32_t totalCount; /** - * The number of Assets that fail to synchronize. + * The count of Assets that fail to synchronize. */ - uint32_t failedNum; + uint32_t failedCount; } Asset_SyncResult; #ifdef __cplusplus -- Gitee From e70b138dd297eebfc81af63537ab9d1bbf9ea758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=94=BF?= Date: Thu, 24 Apr 2025 20:55:52 +0800 Subject: [PATCH 11/71] xxxxx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 李政 --- multimedia/camera_framework/camera.ndk.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/multimedia/camera_framework/camera.ndk.json b/multimedia/camera_framework/camera.ndk.json index cc333d328..372fb7615 100644 --- a/multimedia/camera_framework/camera.ndk.json +++ b/multimedia/camera_framework/camera.ndk.json @@ -650,5 +650,17 @@ { "first_introduced": "14", "name": "OH_CaptureSession_SetQualityPrioritization" + }, + { + "first_introduced": "18", + "name": "OH_CameraManager_GetCameraDevice" + }, + { + "first_introduced": "18", + "name": "OH_CameraManager_GetCameraConcurrentInfos" + }, + { + "first_introduced": "18", + "name": "OH_CameraInput_OpenConcurrentCameras" } ] -- Gitee From feb25bdff9c249d3b9381e5169d3fe7321734bcf Mon Sep 17 00:00:00 2001 From: skye-you Date: Fri, 25 Apr 2025 17:32:39 +0800 Subject: [PATCH 12/71] change description Signed-off-by: wind --- security/asset/inc/asset_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/asset/inc/asset_type.h b/security/asset/inc/asset_type.h index ad90fbfdb..0e72c06e2 100755 --- a/security/asset/inc/asset_type.h +++ b/security/asset/inc/asset_type.h @@ -502,7 +502,7 @@ typedef struct { */ int32_t resultCode; /** - * The total count of synchronization. + * The total count of synchronized Assets. */ uint32_t totalCount; /** -- Gitee From 318ff46876fdea16f55380279772c08db3d156fc Mon Sep 17 00:00:00 2001 From: yang-junfeng0621 Date: Mon, 28 Apr 2025 12:42:34 +0800 Subject: [PATCH 13/71] =?UTF-8?q?BUILD.GN=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang-junfeng0621 --- security/huks/BUILD.gn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/security/huks/BUILD.gn b/security/huks/BUILD.gn index 9c8b72985..4a8d8ea12 100644 --- a/security/huks/BUILD.gn +++ b/security/huks/BUILD.gn @@ -19,7 +19,12 @@ ohos_ndk_library("libhuks_ndk") { ndk_description_file = "./libhuks.ndk.json" min_compact_version = "1" - # system_capability = "SystemCapability.Security.Huks" + system_capability = "SystemCapability.Security.Huks" + system_capability_headers = [ + "./include/native_huks_api.h", + "./include/native_huks_param.h", + "./include/native_huks_type.h", + ] } ohos_ndk_headers("huks_header") { -- Gitee From afd6ccd80102728d85e8c1af049aea4065b051bd Mon Sep 17 00:00:00 2001 From: cat Date: Mon, 28 Apr 2025 21:41:33 +0800 Subject: [PATCH 14/71] repair interface Signed-off-by: cat --- startup/init/syscap/BUILD.gn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/startup/init/syscap/BUILD.gn b/startup/init/syscap/BUILD.gn index d28cab6c0..b5ab10fee 100644 --- a/startup/init/syscap/BUILD.gn +++ b/startup/init/syscap/BUILD.gn @@ -18,6 +18,11 @@ ohos_ndk_library("libdeviceinfo_ndk") { output_name = "deviceinfo_ndk" ndk_description_file = "./libdeviceinfo.ndk.json" min_compact_version = "1" + system_capability = "SystemCapability.Startup.SystemInfo" + system_capability_headers = [ + "deviceinfo.h", + "syscap_ndk.h", + ] } ohos_ndk_headers("deviceinfo_header") { -- Gitee From ae7d9ac8ffb6dc11eceacdfa278283fd84ebc96f Mon Sep 17 00:00:00 2001 From: jango Date: Wed, 2 Apr 2025 16:06:35 +0800 Subject: [PATCH 15/71] Add macro interface Signed-off-by: jango --- multimedia/camera_framework/capture_session.h | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/multimedia/camera_framework/capture_session.h b/multimedia/camera_framework/capture_session.h index bbccf4e81..11f2af9c1 100644 --- a/multimedia/camera_framework/capture_session.h +++ b/multimedia/camera_framework/capture_session.h @@ -929,6 +929,31 @@ Camera_ErrorCode OH_CaptureSession_EnableAutoDeviceSwitch(Camera_CaptureSession* Camera_ErrorCode OH_CaptureSession_SetQualityPrioritization( Camera_CaptureSession* session, Camera_QualityPrioritization qualityPrioritization); +/** + * @brief Check whether macro ability is supported. + * + * @param session the {@link Camera_CaptureSession} instance. + * @param isSupported the result of whether macro ability supported. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. + * @since 17 + */ +Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* session, bool* isSupported); + +/** + * @brief Enable macro ability or not for the camera device. + * + * @param session the {@link Camera_CaptureSession} instance. + * @param enabled the flag of enable macro ability or not. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. + * {@link #CAMERA_OPERATION_NOT_ALLOWED} if operation not allowed. + * @since 17 + */ +Camera_ErrorCode OH_CaptureSession_EnableMacro(Camera_CaptureSession* session, bool enabled); + #ifdef __cplusplus } #endif -- Gitee From 70af9df10fdb2d3821d6f6541f55282b6fd6123e Mon Sep 17 00:00:00 2001 From: jango Date: Mon, 7 Apr 2025 10:08:09 +0800 Subject: [PATCH 16/71] ndk.json add interface Signed-off-by: jango --- multimedia/camera_framework/camera.ndk.json | 8 ++++++++ multimedia/camera_framework/capture_session.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/multimedia/camera_framework/camera.ndk.json b/multimedia/camera_framework/camera.ndk.json index 372fb7615..e92a2841f 100644 --- a/multimedia/camera_framework/camera.ndk.json +++ b/multimedia/camera_framework/camera.ndk.json @@ -662,5 +662,13 @@ { "first_introduced": "18", "name": "OH_CameraInput_OpenConcurrentCameras" + }, + { + "first_introduced": "19", + "name": "OH_CaptureSession_IsMacroSupported" + }, + { + "first_introduced": "19", + "name": "OH_CaptureSession_EnableMacro" } ] diff --git a/multimedia/camera_framework/capture_session.h b/multimedia/camera_framework/capture_session.h index 11f2af9c1..15b1dce11 100644 --- a/multimedia/camera_framework/capture_session.h +++ b/multimedia/camera_framework/capture_session.h @@ -937,7 +937,7 @@ Camera_ErrorCode OH_CaptureSession_SetQualityPrioritization( * @return {@link #CAMERA_OK} if the method call succeeds. * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. - * @since 17 + * @since 19 */ Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* session, bool* isSupported); @@ -950,7 +950,7 @@ Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* sessi * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. * {@link #CAMERA_OPERATION_NOT_ALLOWED} if operation not allowed. - * @since 17 + * @since 19 */ Camera_ErrorCode OH_CaptureSession_EnableMacro(Camera_CaptureSession* session, bool enabled); -- Gitee From 3f6862a8a4abfe2c914e5eca79be7bc6b27b4eed Mon Sep 17 00:00:00 2001 From: jango Date: Tue, 29 Apr 2025 09:31:02 +0800 Subject: [PATCH 17/71] Update comments Signed-off-by: jango --- multimedia/camera_framework/capture_session.h | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/multimedia/camera_framework/capture_session.h b/multimedia/camera_framework/capture_session.h index 15b1dce11..93e77e118 100644 --- a/multimedia/camera_framework/capture_session.h +++ b/multimedia/camera_framework/capture_session.h @@ -930,26 +930,28 @@ Camera_ErrorCode OH_CaptureSession_SetQualityPrioritization( Camera_CaptureSession* session, Camera_QualityPrioritization qualityPrioritization); /** - * @brief Check whether macro ability is supported. - * - * @param session the {@link Camera_CaptureSession} instance. - * @param isSupported the result of whether macro ability supported. - * @return {@link #CAMERA_OK} if the method call succeeds. - * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. - * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. + * @brief Checks whether the macro capability is supported. + * + * @param session Pointer to an {@link Camera_CaptureSession} instance. + * @param isSupported Pointer to the check result. The value true means that the macro capability is supported, and false means the opposite. + * @return {@link Camera_ErrorCode}: + * CAMERA_OK = 0: The function call is successful.\n + * CAMERA_INVALID_ARGUMENT = 7400101: A parameter is missing or the parameter type is incorrect.\n + * CAMERA_SESSION_NOT_CONFIG = 7400103: The capture session is not configured. * @since 19 */ Camera_ErrorCode OH_CaptureSession_IsMacroSupported(Camera_CaptureSession* session, bool* isSupported); /** - * @brief Enable macro ability or not for the camera device. + * @brief Enables or disables the macro capability of the camera device. * - * @param session the {@link Camera_CaptureSession} instance. - * @param enabled the flag of enable macro ability or not. - * @return {@link #CAMERA_OK} if the method call succeeds. - * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. - * {@link #CAMERA_SESSION_NOT_CONFIG} if the capture session not config. - * {@link #CAMERA_OPERATION_NOT_ALLOWED} if operation not allowed. + * @param session Pointer to an {@link Camera_CaptureSession} instance. + * @param enabled Whether to enable the macro capability. The value true means to enable the macro capability, and false means to disable it. + * @return {@link Camera_ErrorCode}: + * CAMERA_OK = 0: The function call is successful.\n + * CAMERA_INVALID_ARGUMENT = 7400101: A parameter is missing or the parameter type is incorrect.\n + * CAMERA_SESSION_NOT_CONFIG = 7400103: The capture session is not configured.\n + * CAMERA_OPERATION_NOT_ALLOWED = 7400102: The operation is not allowed. * @since 19 */ Camera_ErrorCode OH_CaptureSession_EnableMacro(Camera_CaptureSession* session, bool enabled); -- Gitee From 0ce20742dce6810baa0311caadddeeda84db252b Mon Sep 17 00:00:00 2001 From: tuxiaohang Date: Tue, 29 Apr 2025 15:31:56 +0800 Subject: [PATCH 18/71] =?UTF-8?q?=E8=A1=A5=E5=85=85syscap?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: https://gitee.com/openharmony/interface_sdk_c/issues/IC4XHR Signed-off-by: tuxiaohang Change-Id: Ib9637fabc3c02562d37718bd40dd5c5b486eb521 --- arkui/napi/BUILD.gn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arkui/napi/BUILD.gn b/arkui/napi/BUILD.gn index eea7bc451..f5867f115 100644 --- a/arkui/napi/BUILD.gn +++ b/arkui/napi/BUILD.gn @@ -19,6 +19,11 @@ ohos_ndk_library("libnapi_ndk") { ndk_description_file = "./libnapi.ndk.json" min_compact_version = "1" output_name = "ace_napi" + system_capability = "SystemCapability.ArkUI.ArkUI.Napi" + system_capability_headers = [ + "napi/common.h", + "napi/native_api.h", + ] } ohos_ndk_headers("napi_header") { -- Gitee From 05861b016009d9be5de22e5d4eb499dd20cf4a02 Mon Sep 17 00:00:00 2001 From: magekkkk Date: Tue, 29 Apr 2025 11:06:14 +0000 Subject: [PATCH 19/71] change api ver for volume mode Signed-off-by: magekkkk --- .../common/native_audiostream_base.h | 6 +++--- .../common/native_audiostreambuilder.h | 3 +-- multimedia/audio_framework/ohaudio.ndk.json | 2 +- multimedia/player_framework/avplayer.h | 21 ++++++++++--------- .../avplayer/libavplayer.ndk.json | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/multimedia/audio_framework/common/native_audiostream_base.h b/multimedia/audio_framework/common/native_audiostream_base.h index 44b94e83b..7792e064e 100644 --- a/multimedia/audio_framework/common/native_audiostream_base.h +++ b/multimedia/audio_framework/common/native_audiostream_base.h @@ -828,13 +828,13 @@ typedef OH_AudioData_Callback_Result (*OH_AudioRenderer_OnWriteDataCallback)(OH_ /** * @brief Define the audio stream volume mode. * - * @since 18 + * @since 19 */ typedef enum { /** * Indicates this audio stream volume will be affected by system volume, also the default behavior. * - * @since 18 + * @since 19 */ AUDIOSTREAM_VOLUMEMODE_SYSTEM_GLOBAL = 0, @@ -842,7 +842,7 @@ typedef enum { * Indicates this audio stream volume will be affected by app's individual volume percentage which set by yourself * using the app volume api. * - * @since 18 + * @since 19 */ AUDIOSTREAM_VOLUMEMODE_APP_INDIVIDUAL = 1 } OH_AudioStream_VolumeMode; diff --git a/multimedia/audio_framework/common/native_audiostreambuilder.h b/multimedia/audio_framework/common/native_audiostreambuilder.h index 799d066cd..4fd3502b0 100644 --- a/multimedia/audio_framework/common/native_audiostreambuilder.h +++ b/multimedia/audio_framework/common/native_audiostreambuilder.h @@ -390,8 +390,6 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetRendererWriteDataCallback(OH_Audi /** * Set the renderer volume mode of the stream client * - * @since 18 - * * @param builder Reference provided by OH_AudioStreamBuilder_Create() * @param volumeMode Set the volume mode for the renderer client. * @return Function result code: @@ -399,6 +397,7 @@ OH_AudioStream_Result OH_AudioStreamBuilder_SetRendererWriteDataCallback(OH_Audi * {@link AUDIOSTREAM_ERROR_INVALID_PARAM}: * 1.The param of builder is nullptr; * 2.The param of volumeMode invalid. + * @since 19 */ OH_AudioStream_Result OH_AudioStreamBuilder_SetVolumeMode(OH_AudioStreamBuilder* builder, OH_AudioStream_VolumeMode volumeMode); diff --git a/multimedia/audio_framework/ohaudio.ndk.json b/multimedia/audio_framework/ohaudio.ndk.json index de14c6407..abe2f9773 100644 --- a/multimedia/audio_framework/ohaudio.ndk.json +++ b/multimedia/audio_framework/ohaudio.ndk.json @@ -384,7 +384,7 @@ "name": "OH_AudioRenderer_GetAudioTimestampInfo" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_AudioStreamBuilder_SetVolumeMode" }, { diff --git a/multimedia/player_framework/avplayer.h b/multimedia/player_framework/avplayer.h index f87d5b2bc..3cd37c257 100644 --- a/multimedia/player_framework/avplayer.h +++ b/multimedia/player_framework/avplayer.h @@ -593,16 +593,17 @@ OH_AVErrCode OH_AVPlayer_SetOnInfoCallback(OH_AVPlayer *player, OH_AVPlayerOnInf OH_AVErrCode OH_AVPlayer_SetOnErrorCallback(OH_AVPlayer *player, OH_AVPlayerOnErrorCallback callback, void *userData); /** - * @brief Set volume mode of the player - * @param player Pointer to an OH_AVPlayer instance - * @param volumeMode The value {@link OH_AudioStream_VolumeMode} indicated volume mode of the player. - * @return Function result code. - * {@link AV_ERR_OK} if the execution is successful. - * {@link AV_ERR_INVALID_VAL} if input player is nullptr or volumeMode value is invalid. - * {@link AV_ERR_INVALID_STATE} function called in invalid state, should before prepare state. - * {@link AV_ERR_SERVICE_DIED} media service died, system error. - * @since 18 - * @version 1.0 + * @brief Sets the volume mode of the AVPlayer. + * @param player Pointer to an OH_AVPlayer instance. + * @param volumeMode Volume mode, which is defined in {@link OH_AudioStream_VolumeMode}. + * @return Result code. + * {@link AV_ERR_OK}: The execution is successful. + * {@link AV_ERR_INVALID_VAL}: The value of player is a null pointer or + * the value of volumeMode is invalid. + * {@link AV_ERR_INVALID_STATE}: The function is called in an incorrect state. + * This function should be called prior to prepare. + * {@link AV_ERR_SERVICE_DIED}: System errors such as media service breakdown. + * @since 19 */ OH_AVErrCode OH_AVPlayer_SetVolumeMode(OH_AVPlayer *player, OH_AudioStream_VolumeMode volumeMode); diff --git a/multimedia/player_framework/avplayer/libavplayer.ndk.json b/multimedia/player_framework/avplayer/libavplayer.ndk.json index 28f2b2b13..f0b48063e 100644 --- a/multimedia/player_framework/avplayer/libavplayer.ndk.json +++ b/multimedia/player_framework/avplayer/libavplayer.ndk.json @@ -136,7 +136,7 @@ "name": "OH_AVPlayer_SetAudioEffectMode" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_AVPlayer_SetVolumeMode" } ] \ No newline at end of file -- Gitee From 98a2b4bb91db8734c5d2f69c8d1337f42524b17a Mon Sep 17 00:00:00 2001 From: sunbees Date: Wed, 30 Apr 2025 09:28:17 +0800 Subject: [PATCH 20/71] xcomponent surfaceHolder api version change to 19 Signed-off-by: sunbees Change-Id: I772b3e1ad87533930387d7ae6eff480af2993b44 --- .../native/native_interface_xcomponent.h | 38 +++++++++---------- arkui/ace_engine/native/native_type.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/arkui/ace_engine/native/native_interface_xcomponent.h b/arkui/ace_engine/native/native_interface_xcomponent.h index ba637bd4d..8d2a66804 100644 --- a/arkui/ace_engine/native/native_interface_xcomponent.h +++ b/arkui/ace_engine/native/native_interface_xcomponent.h @@ -912,7 +912,7 @@ int32_t OH_ArkUI_XComponent_StopImageAnalyzer(ArkUI_NodeHandle node); /** * @brief Provides an encapsulated OH_ArkUI_SurfaceHolder instance. * - * @since 18 + * @since 19 */ typedef struct OH_ArkUI_SurfaceHolder OH_ArkUI_SurfaceHolder; @@ -921,7 +921,7 @@ typedef struct OH_ArkUI_SurfaceHolder OH_ArkUI_SurfaceHolder; * * @param node Indicates the pointer to the XComponent node. * @return Returns the created OH_ArkUI_SurfaceHolder object's pointer. - * @since 18 + * @since 19 */ OH_ArkUI_SurfaceHolder* OH_ArkUI_SurfaceHolder_Create(ArkUI_NodeHandle node); @@ -929,7 +929,7 @@ OH_ArkUI_SurfaceHolder* OH_ArkUI_SurfaceHolder_Create(ArkUI_NodeHandle node); * @brief Disposes of a OH_ArkUI_SurfaceHolder object. * * @param node Indicates the pointer to OH_ArkUI_SurfaceHolder object needed to dispose. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceHolder_Dispose(OH_ArkUI_SurfaceHolder* surfaceHolder); @@ -942,7 +942,7 @@ void OH_ArkUI_SurfaceHolder_Dispose(OH_ArkUI_SurfaceHolder* surfaceHolder); * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SurfaceHolder_SetUserData(OH_ArkUI_SurfaceHolder* surfaceHolder, void* userData); @@ -951,14 +951,14 @@ int32_t OH_ArkUI_SurfaceHolder_SetUserData(OH_ArkUI_SurfaceHolder* surfaceHolder * * @param surfaceHolder Indicates the target OH_ArkUI_SurfaceHolder instance. * @return Returns the custom data. - * @since 18 + * @since 19 */ void* OH_ArkUI_SurfaceHolder_GetUserData(OH_ArkUI_SurfaceHolder* surfaceHolder); /** * @brief Define the surface lifecycle callback. * - * @since 18 + * @since 19 */ typedef struct OH_ArkUI_SurfaceCallback OH_ArkUI_SurfaceCallback; @@ -966,7 +966,7 @@ typedef struct OH_ArkUI_SurfaceCallback OH_ArkUI_SurfaceCallback; * @brief Create a OH_ArkUI_SurfaceCallback object. * * @return Returns the created OH_ArkUI_SurfaceCallback object's pointer. - * @since 18 + * @since 19 */ OH_ArkUI_SurfaceCallback* OH_ArkUI_SurfaceCallback_Create(); @@ -974,7 +974,7 @@ OH_ArkUI_SurfaceCallback* OH_ArkUI_SurfaceCallback_Create(); * @brief Disposes of a OH_ArkUI_SurfaceCallback object. * * @param callback Indicates the pointer to OH_ArkUI_SurfaceCallback object needed to dispose. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_Dispose(OH_ArkUI_SurfaceCallback* callback); @@ -984,7 +984,7 @@ void OH_ArkUI_SurfaceCallback_Dispose(OH_ArkUI_SurfaceCallback* callback); * @param callback Indicated the pointer to the surface callback. * @param onSurfaceCreated Indicates the surface created callback event * which will called when the surface is created. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_SetSurfaceCreatedEvent( OH_ArkUI_SurfaceCallback* callback, @@ -996,7 +996,7 @@ void OH_ArkUI_SurfaceCallback_SetSurfaceCreatedEvent( * @param callback Indicated the pointer to the surface callback. * @param onSurfaceChanged Indicates the surface changed callback event * which will called when the surface is changed. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_SetSurfaceChangedEvent( OH_ArkUI_SurfaceCallback* callback, @@ -1008,7 +1008,7 @@ void OH_ArkUI_SurfaceCallback_SetSurfaceChangedEvent( * @param callback Indicated the pointer to the surface callback. * @param onSurfaceDestroyed Indicates the surface destroyed callback event * which will called when the surface is destroyed. - * @since 18 + * @since 19 */ void OH_ArkUI_SurfaceCallback_SetSurfaceDestroyedEvent( OH_ArkUI_SurfaceCallback* callback, @@ -1022,7 +1022,7 @@ void OH_ArkUI_SurfaceCallback_SetSurfaceDestroyedEvent( * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SurfaceHolder_AddSurfaceCallback( OH_ArkUI_SurfaceHolder* surfaceHolder, @@ -1037,7 +1037,7 @@ int32_t OH_ArkUI_SurfaceHolder_AddSurfaceCallback( * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SurfaceHolder_RemoveSurfaceCallback( OH_ArkUI_SurfaceHolder* surfaceHolder, @@ -1046,7 +1046,7 @@ int32_t OH_ArkUI_SurfaceHolder_RemoveSurfaceCallback( /** * @brief Forward declaration of OHNativeWindow. * - * @since 18 + * @since 19 */ typedef struct NativeWindow OHNativeWindow; @@ -1055,7 +1055,7 @@ typedef struct NativeWindow OHNativeWindow; * * @param surfaceHolder Indicates the pointer to this OH_ArkUI_SurfaceHolder instance. * @return Returns the nativeWindow associated with this OH_ArkUI_SurfaceHolder instance. - * @since 18 + * @since 19 */ OHNativeWindow* OH_ArkUI_XComponent_GetNativeWindow(OH_ArkUI_SurfaceHolder* surfaceHolder); @@ -1070,7 +1070,7 @@ OHNativeWindow* OH_ArkUI_XComponent_GetNativeWindow(OH_ArkUI_SurfaceHolder* surf * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_SetAutoInitialize(ArkUI_NodeHandle node, bool autoInitialize); @@ -1082,7 +1082,7 @@ int32_t OH_ArkUI_XComponent_SetAutoInitialize(ArkUI_NodeHandle node, bool autoIn * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. * {@link ARKUI_ERROR_CODE_XCOMPONENT_STATE_INVALID} if the node has initialized. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_Initialize(ArkUI_NodeHandle node); @@ -1094,7 +1094,7 @@ int32_t OH_ArkUI_XComponent_Initialize(ArkUI_NodeHandle node); * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. * {@link ARKUI_ERROR_CODE_XCOMPONENT_STATE_INVALID} if the node has finalized. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_Finalize(ArkUI_NodeHandle node); @@ -1106,7 +1106,7 @@ int32_t OH_ArkUI_XComponent_Finalize(ArkUI_NodeHandle node); * @return Returns the status code of the execution. * {@link ARKUI_ERROR_CODE_NO_ERROR} the execution is successful. * {@link ARKUI_ERROR_CODE_PARAM_INVALID} if the node is invalid. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_XComponent_IsInitialized(ArkUI_NodeHandle node, bool* isInitialized); diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 005fd0888..ff4522e3c 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -2158,7 +2158,7 @@ typedef enum { ARKUI_ERROR_CODE_INTERNAL_ERROR = 100001, /** * @error The XComponent is in invalid state. - * @since 18 + * @since 19 */ ARKUI_ERROR_CODE_XCOMPONENT_STATE_INVALID = 103501, /** @error The component does not support specific properties or events. */ -- Gitee From b70016b60189173f477f52eeb1d737bd58a6af1c Mon Sep 17 00:00:00 2001 From: zhanghang Date: Wed, 30 Apr 2025 11:16:14 +0800 Subject: [PATCH 21/71] calendar change capi version. Signed-off-by: zhanghang --- arkui/ace_engine/native/native_node.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index bf28f36b5..1f1b713b5 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -6248,7 +6248,7 @@ typedef enum { * Format of the return value {@link ArkUI_AttributeItem}:\n * .string: A string of dates.\n * - * @since 18 + * @since 19 */ NODE_CALENDAR_PICKER_DISABLED_DATE_RANGE = 16006, @@ -6262,7 +6262,7 @@ typedef enum { * Format of the return value {@link ArkUI_AttributeItem}:\n * value[0].i32: whether the calendar picker marks today.\n * - * @since 18 + * @since 19 */ NODE_CALENDAR_PICKER_MARK_TODAY = 16007, } ArkUI_NodeAttributeType; -- Gitee From fe60e9eafdf8e7cf75f26a3e36fa12da98212625 Mon Sep 17 00:00:00 2001 From: xuzhidan Date: Wed, 30 Apr 2025 11:18:19 +0800 Subject: [PATCH 22/71] Scroll component change to API19 Signed-off-by: xuzhidan Change-Id: Id3a22dd7a318d281e22b6dbf8790053007366fc7 --- arkui/ace_engine/native/native_type.h | 84 +++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 005fd0888..c7ea0de84 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -3183,7 +3183,7 @@ int32_t OH_ArkUI_SwiperIndicator_GetMaxDisplayCount(ArkUI_SwiperIndicator* indic * @param indicator Indicates the pointer to the indicator. * @param ignoreSize Whether to ignore the size of the indicator. The value 1 means to ignore, and 0 means the opposite. * The default value is 0. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperIndicator_SetIgnoreSizeOfBottom(ArkUI_SwiperIndicator* indicator, int32_t ignoreSize); @@ -3192,7 +3192,7 @@ void OH_ArkUI_SwiperIndicator_SetIgnoreSizeOfBottom(ArkUI_SwiperIndicator* indic * * @param indicator Indicates the pointer to the indicator. * @return Returns whether to ignore the size of the indicator. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SwiperIndicator_GetIgnoreSizeOfBottom(ArkUI_SwiperIndicator* indicator); @@ -3201,7 +3201,7 @@ int32_t OH_ArkUI_SwiperIndicator_GetIgnoreSizeOfBottom(ArkUI_SwiperIndicator* in * * @param indicator Indicates the pointer to the indicator. * @param space the space between the dots of the navigation indicator, the default value is 8vp. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperIndicator_SetSpace(ArkUI_SwiperIndicator* indicator, float space); @@ -3210,7 +3210,7 @@ void OH_ArkUI_SwiperIndicator_SetSpace(ArkUI_SwiperIndicator* indicator, float s * * @param indicator Indicates the pointer to the indicator. * @return the space between the dots of the navigation indicator - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperIndicator_GetSpace(ArkUI_SwiperIndicator* indicator); @@ -3218,7 +3218,7 @@ float OH_ArkUI_SwiperIndicator_GetSpace(ArkUI_SwiperIndicator* indicator); * @brief Creates a digital indicator. * * @return Returns the pointer to the new indicator. - * @since 18 + * @since 19 */ ArkUI_SwiperDigitIndicator *OH_ArkUI_SwiperDigitIndicator_Create(); @@ -3227,7 +3227,7 @@ ArkUI_SwiperDigitIndicator *OH_ArkUI_SwiperDigitIndicator_Create(); * * @param indicator The pointer to the digital indicator. * @param value Indicates the distance between the digital indicator and the start of the swiper. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetStartPosition(ArkUI_SwiperDigitIndicator* indicator, float value); @@ -3236,7 +3236,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetStartPosition(ArkUI_SwiperDigitIndicator* * * @param indicator The pointer to the digital indicator. * @return Returns the distance between the digital indicator and the start of the swiper. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperDigitIndicator_GetStartPosition(ArkUI_SwiperDigitIndicator* indicator); @@ -3245,7 +3245,7 @@ float OH_ArkUI_SwiperDigitIndicator_GetStartPosition(ArkUI_SwiperDigitIndicator* * * @param indicator The pointer to the digital indicator. * @param value Indicates the distance between the digital indicator and the top of the swiper. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetTopPosition(ArkUI_SwiperDigitIndicator* indicator, float value); @@ -3254,7 +3254,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetTopPosition(ArkUI_SwiperDigitIndicator* in * * @param indicator The pointer to the digital indicator. * @return Returns the distance between the digital indicator and the top of the swiper. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperDigitIndicator_GetTopPosition(ArkUI_SwiperDigitIndicator* indicator); @@ -3263,7 +3263,7 @@ float OH_ArkUI_SwiperDigitIndicator_GetTopPosition(ArkUI_SwiperDigitIndicator* i * * @param indicator The pointer to the digital indicator. * @param value Indicates the distance between the digital indicator and the end of the swiper. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetEndPosition(ArkUI_SwiperDigitIndicator* indicator, float value); @@ -3272,7 +3272,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetEndPosition(ArkUI_SwiperDigitIndicator* in * * @param indicator The pointer to the digital indicator. * @return Returns the distance between the digital indicator and the end of the swiper. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperDigitIndicator_GetEndPosition(ArkUI_SwiperDigitIndicator* indicator); @@ -3281,7 +3281,7 @@ float OH_ArkUI_SwiperDigitIndicator_GetEndPosition(ArkUI_SwiperDigitIndicator* i * * @param indicator The pointer to the digital indicator. * @param value Returns the distance between the digital indicator and the bottom of the swiper. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetBottomPosition(ArkUI_SwiperDigitIndicator* indicator, float value); @@ -3290,7 +3290,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetBottomPosition(ArkUI_SwiperDigitIndicator* * * @param indicator The pointer to the digital indicator. * @return Returns the distance between the digital indicator and the bottom of the swiper. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperDigitIndicator_GetBottomPosition(ArkUI_SwiperDigitIndicator* indicator); @@ -3299,7 +3299,7 @@ float OH_ArkUI_SwiperDigitIndicator_GetBottomPosition(ArkUI_SwiperDigitIndicator * * @param indicator The pointer to the digital indicator. * @param color font color, in 0xARGB format. Default value: 0xFF182431. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetFontColor(ArkUI_SwiperDigitIndicator* indicator, uint32_t color); @@ -3308,7 +3308,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetFontColor(ArkUI_SwiperDigitIndicator* indi * * @param indicator The pointer to the digital indicator. * @return font color, in 0xARGB format. - * @since 18 + * @since 19 */ uint32_t OH_ArkUI_SwiperDigitIndicator_GetFontColor(ArkUI_SwiperDigitIndicator* indicator); @@ -3317,7 +3317,7 @@ uint32_t OH_ArkUI_SwiperDigitIndicator_GetFontColor(ArkUI_SwiperDigitIndicator* * * @param indicator The pointer to the digital indicator. * @param selectedColor font color, in 0xARGB format. Default value: 0xFF182431. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetSelectedFontColor(ArkUI_SwiperDigitIndicator* indicator, uint32_t selectedColor); @@ -3326,7 +3326,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetSelectedFontColor(ArkUI_SwiperDigitIndicat * * @param indicator The pointer to the digital indicator. * @return font color, in 0xARGB format. - * @since 18 + * @since 19 */ uint32_t OH_ArkUI_SwiperDigitIndicator_GetSelectedFontColor(ArkUI_SwiperDigitIndicator* indicator); @@ -3335,7 +3335,7 @@ uint32_t OH_ArkUI_SwiperDigitIndicator_GetSelectedFontColor(ArkUI_SwiperDigitInd * * @param indicator The pointer to the digital indicator. * @param size font size, in fp. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetFontSize(ArkUI_SwiperDigitIndicator* indicator, float size); @@ -3344,7 +3344,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetFontSize(ArkUI_SwiperDigitIndicator* indic * * @param indicator The pointer to the digital indicator. * @return font size, in fp. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperDigitIndicator_GetFontSize(ArkUI_SwiperDigitIndicator* indicator); @@ -3353,7 +3353,7 @@ float OH_ArkUI_SwiperDigitIndicator_GetFontSize(ArkUI_SwiperDigitIndicator* indi * * @param indicator The pointer to the digital indicator. * @param size font size, in fp. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetSelectedFontSize(ArkUI_SwiperDigitIndicator* indicator, float size); @@ -3362,7 +3362,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetSelectedFontSize(ArkUI_SwiperDigitIndicato * * @param indicator The pointer to the digital indicator. * @return font size, in fp. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperDigitIndicator_GetSelectedFontSize(ArkUI_SwiperDigitIndicator* indicator); @@ -3371,7 +3371,7 @@ float OH_ArkUI_SwiperDigitIndicator_GetSelectedFontSize(ArkUI_SwiperDigitIndicat * * @param indicator The pointer to the digital indicator. * @param fontWeight font weight {@link ArkUI_FontWeight}. The default value is ARKUI_FONT_WEIGHT_NORMAL. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetFontWeight(ArkUI_SwiperDigitIndicator *indicator, ArkUI_FontWeight fontWeight); @@ -3380,7 +3380,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetFontWeight(ArkUI_SwiperDigitIndicator *ind * * @param indicator The pointer to the digital indicator. * @return font weight {@link ArkUI_FontWeight}. - * @since 18 + * @since 19 */ ArkUI_FontWeight OH_ArkUI_SwiperDigitIndicator_GetFontWeight(ArkUI_SwiperDigitIndicator* indicator); @@ -3389,7 +3389,7 @@ ArkUI_FontWeight OH_ArkUI_SwiperDigitIndicator_GetFontWeight(ArkUI_SwiperDigitIn * * @param indicator The pointer to the digital indicator. * @param selectedFontWeight font weight {@link ArkUI_FontWeight}. The default value is ARKUI_FONT_WEIGHT_NORMAL. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetSelectedFontWeight( ArkUI_SwiperDigitIndicator *indicator, ArkUI_FontWeight selectedFontWeight); @@ -3399,7 +3399,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetSelectedFontWeight( * * @param indicator The pointer to the digital indicator. * @return font weight {@link ArkUI_FontWeight}. - * @since 18 + * @since 19 */ ArkUI_FontWeight OH_ArkUI_SwiperDigitIndicator_GetSelectedFontWeight(ArkUI_SwiperDigitIndicator* indicator); @@ -3407,7 +3407,7 @@ ArkUI_FontWeight OH_ArkUI_SwiperDigitIndicator_GetSelectedFontWeight(ArkUI_Swipe * @brief Destroys the digital indicator. * * @param indicator The pointer to the digital indicator. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_Destroy(ArkUI_SwiperDigitIndicator *indicator); @@ -3417,7 +3417,7 @@ void OH_ArkUI_SwiperDigitIndicator_Destroy(ArkUI_SwiperDigitIndicator *indicator * @param indicator The pointer to the digital indicator. * @param ignoreSize Whether to ignore the size of the indicator. The value 1 means to ignore, and 0 means the opposite. * The default value is 0. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperDigitIndicator_SetIgnoreSizeOfBottom(ArkUI_SwiperDigitIndicator* indicator, int32_t ignoreSize); @@ -3426,7 +3426,7 @@ void OH_ArkUI_SwiperDigitIndicator_SetIgnoreSizeOfBottom(ArkUI_SwiperDigitIndica * * @param indicator The pointer to the digital indicator. * @return Returns whether to ignore the size of the indicator. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SwiperDigitIndicator_GetIgnoreSizeOfBottom(ArkUI_SwiperDigitIndicator* indicator); @@ -3434,7 +3434,7 @@ int32_t OH_ArkUI_SwiperDigitIndicator_GetIgnoreSizeOfBottom(ArkUI_SwiperDigitInd * @brief Creates a arrow style for swiper. * * @return Returns the pointer to the new arrow style. - * @since 18 + * @since 19 */ ArkUI_SwiperArrowStyle *OH_ArkUI_SwiperArrowStyle_Create(); @@ -3445,7 +3445,7 @@ ArkUI_SwiperArrowStyle *OH_ArkUI_SwiperArrowStyle_Create(); * @param showBackground whether to show the background for the arrow. * The value 1 means to show the background, and 0 means the opposite. * The default value is 0. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperArrowStyle_SetShowBackground(ArkUI_SwiperArrowStyle *arrowStyle, int32_t showBackground); @@ -3455,7 +3455,7 @@ void OH_ArkUI_SwiperArrowStyle_SetShowBackground(ArkUI_SwiperArrowStyle *arrowSt * @param arrowStyle The pointer to the arrow style. * @return whether to show the background for the arrow. * The value 1 means to show the background, and 0 means the opposite. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SwiperArrowStyle_GetShowBackground(ArkUI_SwiperArrowStyle* arrowStyle); @@ -3467,7 +3467,7 @@ int32_t OH_ArkUI_SwiperArrowStyle_GetShowBackground(ArkUI_SwiperArrowStyle* arro * The value 1 means to display on boths sides of the swiper, * and 0 means display on boths sides of the swiper indicator. * The default value is 0. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperArrowStyle_SetShowSidebarMiddle(ArkUI_SwiperArrowStyle* arrowStyle, int32_t showSidebarMiddle); @@ -3477,7 +3477,7 @@ void OH_ArkUI_SwiperArrowStyle_SetShowSidebarMiddle(ArkUI_SwiperArrowStyle* arro * @param arrowStyle The pointer to the arrow style. * @return the display position of the arrow. The value 1 means to display on boths sides of the swiper, * and 0 means display on boths sides of the swiper indicator. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_SwiperArrowStyle_GetShowSidebarMiddle(ArkUI_SwiperArrowStyle* arrowStyle); @@ -3488,7 +3488,7 @@ int32_t OH_ArkUI_SwiperArrowStyle_GetShowSidebarMiddle(ArkUI_SwiperArrowStyle* a * @param backgroundSize the background size of the arrow. The unit is vp. * The default value is 24 when the arrow displays on both sides of the swiper indicator. * The default value is 32 when the arrow displays on both sides of the swiper. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperArrowStyle_SetBackgroundSize(ArkUI_SwiperArrowStyle* arrowStyle, float backgroundSize); @@ -3497,7 +3497,7 @@ void OH_ArkUI_SwiperArrowStyle_SetBackgroundSize(ArkUI_SwiperArrowStyle* arrowSt * * @param arrowStyle The pointer to the arrow style. * @return Returns the background size of the arrow. The unit is vp. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperArrowStyle_GetBackgroundSize(ArkUI_SwiperArrowStyle *arrowStyle); @@ -3505,7 +3505,7 @@ float OH_ArkUI_SwiperArrowStyle_GetBackgroundSize(ArkUI_SwiperArrowStyle *arrowS * @brief Destroys the arrow style. * * @param arrowStyle The pointer to the arrow style. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperArrowStyle_Destroy(ArkUI_SwiperArrowStyle *arrowStyle); @@ -3516,7 +3516,7 @@ void OH_ArkUI_SwiperArrowStyle_Destroy(ArkUI_SwiperArrowStyle *arrowStyle); * @param backgroundColor the background color of the arrow, in 0xARGB format. * The default value is 0x00000000 when the arrow displays on both sides of the swiper indicator. * The default value is 0x19182431 when the arrow displays on both sides of the swiper. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperArrowStyle_SetBackgroundColor(ArkUI_SwiperArrowStyle *arrowStyle, uint32_t backgroundColor); @@ -3525,7 +3525,7 @@ void OH_ArkUI_SwiperArrowStyle_SetBackgroundColor(ArkUI_SwiperArrowStyle *arrowS * * @param arrowStyle The pointer to the arrow style. * @return Returns the background color of the arrow, in 0xARGB format. - * @since 18 + * @since 19 */ uint32_t OH_ArkUI_SwiperArrowStyle_GetBackgroundColor(ArkUI_SwiperArrowStyle* arrowStyle); @@ -3537,7 +3537,7 @@ uint32_t OH_ArkUI_SwiperArrowStyle_GetBackgroundColor(ArkUI_SwiperArrowStyle* ar * The default value is 18 when the arrow displays on both sides of the swiper indicator. * The default value is 24 when the arrow displays on both sides of the swiper. * The arrow size is fixed to 3/4 of the background size when the background is shown. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperArrowStyle_SetArrowSize(ArkUI_SwiperArrowStyle* arrowStyle, float arrowSize); @@ -3546,7 +3546,7 @@ void OH_ArkUI_SwiperArrowStyle_SetArrowSize(ArkUI_SwiperArrowStyle* arrowStyle, * * @param arrowStyle The pointer to the arrow style. * @return the size of the arrow. The unit is vp. - * @since 18 + * @since 19 */ float OH_ArkUI_SwiperArrowStyle_GetArrowSize(ArkUI_SwiperArrowStyle* arrowStyle); @@ -3555,7 +3555,7 @@ float OH_ArkUI_SwiperArrowStyle_GetArrowSize(ArkUI_SwiperArrowStyle* arrowStyle) * * @param arrowStyle The pointer to the arrow style. * @param arrowColor the color of the arrow, in 0xARGB format. The default value is 0x00182431. - * @since 18 + * @since 19 */ void OH_ArkUI_SwiperArrowStyle_SetArrowColor(ArkUI_SwiperArrowStyle* arrowStyle, uint32_t arrowColor); @@ -3564,7 +3564,7 @@ void OH_ArkUI_SwiperArrowStyle_SetArrowColor(ArkUI_SwiperArrowStyle* arrowStyle, * * @param arrowStyle The pointer to the arrow style. * @return Returns the color of the arrow, in 0xARGB format. - * @since 18 + * @since 19 */ uint32_t OH_ArkUI_SwiperArrowStyle_GetArrowColor(ArkUI_SwiperArrowStyle* arrowStyle); -- Gitee From ff4cb991b8322dcee3ecfb6a0900764d9d226992 Mon Sep 17 00:00:00 2001 From: liuguangsheng Date: Fri, 25 Apr 2025 15:55:40 +0800 Subject: [PATCH 23/71] =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=9C=A8AVRecorder=E5=BD=95=E5=88=B6=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=87=AA=E5=8A=A8=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuguangsheng --- multimedia/media_library/media_asset_base_capi.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/multimedia/media_library/media_asset_base_capi.h b/multimedia/media_library/media_asset_base_capi.h index 53380d6de..4c117ed68 100644 --- a/multimedia/media_library/media_asset_base_capi.h +++ b/multimedia/media_library/media_asset_base_capi.h @@ -246,7 +246,14 @@ typedef enum MediaLibrary_ResourceType { */ typedef enum MediaLibrary_ImageFileType { /*JPEG type*/ - MEDIA_LIBRARY_IMAGE_JPEG = 1 + MEDIA_LIBRARY_IMAGE_JPEG = 1, + + /** + * @brief MPEG type + * + * @since 19 + */ + MEDIA_LIBRARY_FILE_VIDEO = 3, } MediaLibrary_ImageFileType; /** -- Gitee From 8fbb88d99230822bbca2fb2ad3644785c7da8a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E4=B8=80=E9=B8=A3?= Date: Tue, 6 May 2025 03:07:31 +0000 Subject: [PATCH 24/71] update commonlibrary/memory_utils/libpurgeablemem/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 蔡一鸣 --- commonlibrary/memory_utils/libpurgeablemem/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn index 6ffd6731c..043eb3f53 100644 --- a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn +++ b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn @@ -21,7 +21,7 @@ ohos_ndk_headers("purgeable_memory_header") { ohos_ndk_library("libpurgeable_memory_ndk") { output_name = "purgeable_memory_ndk" output_extension = "z.so" + system_capability = "SystemCapability.Kernel.Memory" + system_capability_headers = ["commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h"] ndk_description_file = "./libpurgeable_memory.ndk.json" - system_capability = "SystemCapability.CommonLibrary.Memory.PurgeableMemory" - system_capability = "purgeable_memory/purgeable_memory.h" } -- Gitee From b5f1a8a690dc5f09a821b6ced6bd9b29f57fb953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B0=B8=E5=87=AF?= Date: Tue, 6 May 2025 11:10:32 +0800 Subject: [PATCH 25/71] delete capi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘永凯 --- arkui/ace_engine/native/native_node.h | 34 --------------------------- 1 file changed, 34 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index c1458a02f..86791b313 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1929,40 +1929,6 @@ typedef enum { */ NODE_VISIBLE_AREA_APPROXIMATE_CHANGE_RATIO = 102, - /** - * @brief Defines the translate attribute, which supports for percentile translation input, and can be set, reset, - * and obtained as required through APIs.\n - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].f32: distance to translate along the x-axis. The default unit is percentage. - * The unit is vp only if value[3] exists and value[3] is 0. The default value of value[0] is 0.\n - * .value[1].f32: distance to translate along the y-axis. The default unit is percentage. - * The unit is vp only if value[4] exists and value[4] is 0. The default value of value[1] is 0.\n - * .value[2].f32: distance to translate along the z-axis, in vp. The default value is 0.\n - * .value[3]?.i32: Whether the translation distance along the x-axis is specified as a percentage. - * The value can be 0 or 1. When the value is 1, it is specified as a percentage. - * For example, value[0].f32=0.1 and value[3].i32=1 indicates a 10% shift in the x direction. - * The default value is 1.\n - * .value[4]?.i32: Whether the translation distance along the y-axis is specified as a percentage. - * The value can be 0 or 1. When the value is 1, it is specified as a percentage. - * For example, value[1].f32=0.1 and value[4].i32=1 indicates a 10% shift in the y direction. - * The default value is 1.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].f32: distance to translate along the x-axis. The unit depends on value[3].\n - * .value[1].f32: distance to translate along the y-axis. The unit depends on value[4].\n - * .value[2].f32: distance to translate along the z-axis. The unit is vp.\n - * .value[3].i32: Whether the unit of the X-axis translation distance is in percentage. When value[3].i32 is 0, - * the unit of the X-axis translation distance is vp; when value[3].i32 is 1, the unit of the X-axis translation - * distance is percentage;\n - * .value[4].i32: Whether the unit of the Y-axis translation distance is in percentage. When value[4].i32 is 0, - * the unit of the Y-axis translation distance is vp; when value[4].i32 is 1, the unit of the Y-axis translation - * distance is percentage;\n - * - * @since 20 - */ - NODE_TRANSLATE_WITH_PERCENT = 103, - /** * @brief Defines the text content attribute, which can be set, reset, and obtained as required through APIs. * -- Gitee From 8bc8570aaf80159a68a1c3272e1aa6c0a96a63d0 Mon Sep 17 00:00:00 2001 From: c30053238 Date: Tue, 6 May 2025 11:21:36 +0800 Subject: [PATCH 26/71] api18->api19 Signed-off-by: c30053238 --- arkui/ace_engine/native/libace.ndk.json | 4 ++-- arkui/ace_engine/native/native_animate.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 3a129e851..e339fcee9 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -2944,11 +2944,11 @@ "name": "OH_ArkUI_XComponent_StopImageAnalyzer" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_KeyframeAnimateOption_SetExpectedFrameRate" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_KeyframeAnimateOption_GetExpectedFrameRate" }, { diff --git a/arkui/ace_engine/native/native_animate.h b/arkui/ace_engine/native/native_animate.h index 0fbbe8c88..efd745d5d 100644 --- a/arkui/ace_engine/native/native_animate.h +++ b/arkui/ace_engine/native/native_animate.h @@ -421,7 +421,7 @@ int32_t OH_ArkUI_KeyframeAnimateOption_RegisterOnFinishCallback( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_KeyframeAnimateOption_SetExpectedFrameRate( ArkUI_KeyframeAnimateOption* option, ArkUI_ExpectedFrameRateRange* frameRate); @@ -494,7 +494,7 @@ int32_t OH_ArkUI_KeyframeAnimateOption_GetIterations(ArkUI_KeyframeAnimateOption * * @param option Indicates the pointer to a keyframe animation configuration. * @return Returns the expected frame rate range of the keyframe animation. - * @since 18 + * @since 19 */ ArkUI_ExpectedFrameRateRange* OH_ArkUI_KeyframeAnimateOption_GetExpectedFrameRate(ArkUI_KeyframeAnimateOption* option); -- Gitee From 01ff0c138010d8c3fb9c9d51908ba645df3fe3ab Mon Sep 17 00:00:00 2001 From: kangchongtao Date: Tue, 6 May 2025 12:08:07 +0800 Subject: [PATCH 27/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0system=5Fcapability=5Fh?= =?UTF-8?q?eaders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangchongtao Change-Id: I0b535f0eb636b478d27a7226593d1a7da19ab2ef --- arkui/ace_engine/native/BUILD.gn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arkui/ace_engine/native/BUILD.gn b/arkui/ace_engine/native/BUILD.gn index b48b73ada..13d3f7c20 100644 --- a/arkui/ace_engine/native/BUILD.gn +++ b/arkui/ace_engine/native/BUILD.gn @@ -47,5 +47,24 @@ if (!is_arkui_x) { ndk_description_file = "./libace.ndk.json" min_compact_version = "7" output_name = "ace_ndk" + system_capability = "SystemCapability.ArkUI.ArkUI.Full" + system_capability_headers = [ + "arkui/drag_and_drop.h", + "arkui/drawable_descriptor.h", + "arkui/native_animate.h", + "arkui/native_dialog.h", + "arkui/native_gesture.h", + "arkui/native_interface.h", + "arkui/native_interface_accessibility.h", + "arkui/native_interface_focus.h", + "arkui/native_key_event.h", + "arkui/native_node.h", + "arkui/native_node_napi.h", + "arkui/native_type.h", + "arkui/styled_string.h", + "arkui/ui_input_event.h", + "ace/xcomponent/native_interface_xcomponent.h", + "ace/xcomponent/native_xcomponent_key_event.h", + ] } } -- Gitee From 415bc0c3b0352ebef0686cb29ede3d652bbde4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E9=99=B6=E9=87=91=E6=B2=9B=E2=80=9D?= Date: Tue, 6 May 2025 12:29:07 +0800 Subject: [PATCH 28/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9build.gn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “陶金沛” --- filemanagement/fileio/BUILD.gn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/filemanagement/fileio/BUILD.gn b/filemanagement/fileio/BUILD.gn index 30b5edb71..3d7e7d108 100644 --- a/filemanagement/fileio/BUILD.gn +++ b/filemanagement/fileio/BUILD.gn @@ -20,7 +20,10 @@ ohos_ndk_library("libohfileio") { output_name = "ohfileio" output_extension = "so" system_capability = "SystemCapability.FileManagement.File.FileIO" - system_capability_headers = [ "filemanagement/fileio/oh_fileio.h" ] + system_capability_headers = [ + "filemanagement/fileio/oh_fileio.h", + "filemanagement/fileio/error_code.h", + ] } ohos_ndk_headers("oh_fileio_header") { -- Gitee From 0c5ecde9022534bc83e369542a9db767243a0de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E4=B8=80=E9=B8=A3?= Date: Tue, 6 May 2025 05:37:13 +0000 Subject: [PATCH 29/71] update commonlibrary/memory_utils/libpurgeablemem/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 蔡一鸣 --- commonlibrary/memory_utils/libpurgeablemem/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn index 043eb3f53..9705139be 100644 --- a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn +++ b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn @@ -22,6 +22,7 @@ ohos_ndk_library("libpurgeable_memory_ndk") { output_name = "purgeable_memory_ndk" output_extension = "z.so" system_capability = "SystemCapability.Kernel.Memory" - system_capability_headers = ["commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h"] + system_capability_headers = + [ "commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h" ] ndk_description_file = "./libpurgeable_memory.ndk.json" } -- Gitee From 49887c6e4c3cacd4dfcdf179da2757328676f6b1 Mon Sep 17 00:00:00 2001 From: ZhaoJinghui Date: Tue, 6 May 2025 14:26:45 +0800 Subject: [PATCH 30/71] rdb build.gn fix Signed-off-by: ZhaoJinghui Change-Id: I35b8c6291d44c0e6d476adfff25c2a0f4b0b6d3b --- distributeddatamgr/relational_store/BUILD.gn | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/distributeddatamgr/relational_store/BUILD.gn b/distributeddatamgr/relational_store/BUILD.gn index 560c94d4d..83e9b1f2a 100644 --- a/distributeddatamgr/relational_store/BUILD.gn +++ b/distributeddatamgr/relational_store/BUILD.gn @@ -46,17 +46,17 @@ ohos_ndk_library("libnative_rdb_ndk") { ndk_description_file = "./libnative_rdb.ndk.json" min_compact_version = "11" system_capability_headers = [ - "$ndk_headers_out_dir/database/data/data_asset.h", - "$ndk_headers_out_dir/database/data/oh_data_value.h", - "$ndk_headers_out_dir/database/data/oh_data_values.h", - "$ndk_headers_out_dir/database/data/oh_data_values_buckets.h", - "$ndk_headers_out_dir/database/rdb/oh_cursor.h", - "$ndk_headers_out_dir/database/rdb/oh_predicates.h", - "$ndk_headers_out_dir/database/rdb/oh_rdb_transaction.h", - "$ndk_headers_out_dir/database/rdb/oh_rdb_types.h", - "$ndk_headers_out_dir/database/rdb/oh_value_object.h", - "$ndk_headers_out_dir/database/rdb/oh_values_bucket.h", - "$ndk_headers_out_dir/database/rdb/relational_store.h", - "$ndk_headers_out_dir/database/rdb/relational_store_error_code.h", + "database/data/data_asset.h", + "database/data/oh_data_value.h", + "database/data/oh_data_values.h", + "database/data/oh_data_values_buckets.h", + "database/rdb/oh_cursor.h", + "database/rdb/oh_predicates.h", + "database/rdb/oh_rdb_transaction.h", + "database/rdb/oh_rdb_types.h", + "database/rdb/oh_value_object.h", + "database/rdb/oh_values_bucket.h", + "database/rdb/relational_store.h", + "database/rdb/relational_store_error_code.h", ] } -- Gitee From b941f4a728ab57b4029cd1c6774a592e01e4438d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=80=80=E5=BE=B7?= Date: Tue, 6 May 2025 14:49:36 +0800 Subject: [PATCH 31/71] syscap asset modify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 尹耀德 --- security/asset/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/asset/BUILD.gn b/security/asset/BUILD.gn index 18ec0924e..422690b4d 100755 --- a/security/asset/BUILD.gn +++ b/security/asset/BUILD.gn @@ -20,8 +20,8 @@ ohos_ndk_library("libasset_ndk") { min_compact_version = "11" system_capability = "SystemCapability.Security.Asset" system_capability_headers = [ - "inc/asset_api.h", - "inc/asset_type.h", + "asset/asset_api.h", + "asset/asset_type.h", ] } -- Gitee From 88239a270c29994b71b54ac86f96b9a5e0400e49 Mon Sep 17 00:00:00 2001 From: wangwenjun Date: Tue, 6 May 2025 15:03:58 +0800 Subject: [PATCH 32/71] musl add malloc_check_from_ptr Signed-off-by: wangwenjun --- third_party/musl/ndk_musl_include/malloc.h | 44 +++++++++++++++++++ .../musl/ndk_script/adapter/libc.ndk.json | 3 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/third_party/musl/ndk_musl_include/malloc.h b/third_party/musl/ndk_musl_include/malloc.h index 4817d5a5e..abfeb81eb 100644 --- a/third_party/musl/ndk_musl_include/malloc.h +++ b/third_party/musl/ndk_musl_include/malloc.h @@ -1,3 +1,35 @@ +/* + * 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. + */ +/** + * @addtogroup MuslMalloc + * @{ + * + * @brief Provide some methods related to memory management. + * @since 12 + */ +/** + * @file malloc.h + * + * @brief Includes some memory-related methods and structures, + * such as: malloc, calloc, realloc, and so on. + * + * @library libc.so + * @kit CstandardLibrary + * @since 12 + */ + #ifndef _MALLOC_H #define _MALLOC_H @@ -35,6 +67,17 @@ void *memalign(size_t, size_t); size_t malloc_usable_size(void *); int mallopt(int param, int value); +/** + * @brief This function determines whether a given memory block was allocated using + * Standard C library Memory Allocator. + * This function is MT-Safe(multi-thread safe) but not signal-safe. + * @param {void *} ptr A pointer to the memory block to be checked. + * @return 1 - The memory block was allocated using Standard C library Memory Allocator. + * 0 - The memory block was not allocated using Standard C library Memory Allocator. + * -1 - The function is not implemented or other error: + */ +int malloc_check_from_ptr(void *ptr); + struct mallinfo { int arena; int ordblks; @@ -66,3 +109,4 @@ struct mallinfo2 { #endif #endif +/** @} */ \ No newline at end of file diff --git a/third_party/musl/ndk_script/adapter/libc.ndk.json b/third_party/musl/ndk_script/adapter/libc.ndk.json index 4a86a82df..c1dfaf89d 100644 --- a/third_party/musl/ndk_script/adapter/libc.ndk.json +++ b/third_party/musl/ndk_script/adapter/libc.ndk.json @@ -1588,5 +1588,6 @@ { "name": "__recv_chk"}, { "name": "__recvfrom_chk"}, { "name": "__open_chk"}, - { "name": "__strlcat_chk"} + { "name": "__strlcat_chk"}, + { "name": "malloc_check_from_ptr"} ] -- Gitee From 87669a188fabf7fa0c367126b8ee846b50a9ab56 Mon Sep 17 00:00:00 2001 From: wangwenjun Date: Tue, 6 May 2025 15:29:48 +0800 Subject: [PATCH 33/71] musl add malloc_check_from_ptr Signed-off-by: wangwenjun --- third_party/musl/ndk_musl_include/malloc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/musl/ndk_musl_include/malloc.h b/third_party/musl/ndk_musl_include/malloc.h index abfeb81eb..3601b2625 100644 --- a/third_party/musl/ndk_musl_include/malloc.h +++ b/third_party/musl/ndk_musl_include/malloc.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2025 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); + * 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 * @@ -74,7 +74,7 @@ int mallopt(int param, int value); * @param {void *} ptr A pointer to the memory block to be checked. * @return 1 - The memory block was allocated using Standard C library Memory Allocator. * 0 - The memory block was not allocated using Standard C library Memory Allocator. - * -1 - The function is not implemented or other error: + * -1 - The function is not implemented or other error. */ int malloc_check_from_ptr(void *ptr); -- Gitee From cd5bf8965d8e94d2aea175d98c923b80ba393c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E4=B8=80=E9=B8=A3?= Date: Tue, 6 May 2025 07:59:26 +0000 Subject: [PATCH 34/71] update commonlibrary/memory_utils/libpurgeablemem/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 蔡一鸣 --- commonlibrary/memory_utils/libpurgeablemem/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn index 9705139be..702b7656d 100644 --- a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn +++ b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn @@ -23,6 +23,6 @@ ohos_ndk_library("libpurgeable_memory_ndk") { output_extension = "z.so" system_capability = "SystemCapability.Kernel.Memory" system_capability_headers = - [ "commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h" ] + [ "purgeable_memory/purgeable_memory.h" ] ndk_description_file = "./libpurgeable_memory.ndk.json" } -- Gitee From b81834f3abbbad265315ef0504be2fdb6ce11a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E4=B8=80=E9=B8=A3?= Date: Tue, 6 May 2025 08:35:17 +0000 Subject: [PATCH 35/71] update commonlibrary/memory_utils/libpurgeablemem/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 蔡一鸣 --- commonlibrary/memory_utils/libpurgeablemem/BUILD.gn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn index 702b7656d..857c13a12 100644 --- a/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn +++ b/commonlibrary/memory_utils/libpurgeablemem/BUILD.gn @@ -22,7 +22,6 @@ ohos_ndk_library("libpurgeable_memory_ndk") { output_name = "purgeable_memory_ndk" output_extension = "z.so" system_capability = "SystemCapability.Kernel.Memory" - system_capability_headers = - [ "purgeable_memory/purgeable_memory.h" ] + system_capability_headers = [ "purgeable_memory/purgeable_memory.h" ] ndk_description_file = "./libpurgeable_memory.ndk.json" } -- Gitee From 004362ee87e967707e98a26991bae9fb25cf15f2 Mon Sep 17 00:00:00 2001 From: yangxuguang-huawei Date: Tue, 6 May 2025 19:07:54 +0800 Subject: [PATCH 36/71] refactor: start_options.h Signed-off-by: yangxuguang-huawei Change-Id: I2f91a3e7dacee542c6faadc19539d6e01d48a390 --- AbilityKit/ability_runtime/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/AbilityKit/ability_runtime/BUILD.gn b/AbilityKit/ability_runtime/BUILD.gn index 350a42c3c..3aedaa13f 100644 --- a/AbilityKit/ability_runtime/BUILD.gn +++ b/AbilityKit/ability_runtime/BUILD.gn @@ -33,5 +33,6 @@ ohos_ndk_library("libability_runtime") { "AbilityKit/ability_runtime/ability_runtime_common.h", "AbilityKit/ability_runtime/application_context.h", "AbilityKit/ability_runtime/context_constant.h", + "AbilityKit/ability_runtime/start_options.h", ] } -- Gitee From c93c38bbf95612459866b99e1fa160158594ca77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=91=E5=B1=91=E5=B1=91?= Date: Tue, 6 May 2025 20:07:13 +0800 Subject: [PATCH 37/71] fix ndk header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 屑屑屑 --- multimedia/image_framework/BUILD.gn | 3 +++ multimedia/image_framework/include/image_pixel_map_mdk.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/multimedia/image_framework/BUILD.gn b/multimedia/image_framework/BUILD.gn index f28533e28..d7786b5a3 100644 --- a/multimedia/image_framework/BUILD.gn +++ b/multimedia/image_framework/BUILD.gn @@ -17,6 +17,9 @@ ohos_ndk_library("libpixelmap_ndk") { ndk_description_file = "./libimage_pixelmap_napi.ndk.json" min_compact_version = "1" output_name = "pixelmap_ndk" + system_capability = "SystemCapability.Multimedia.Image.Core" + system_capability_headers = + [ "multimedia/image_framework/image_pixel_map_mdk.h" ] } ohos_ndk_headers("image_header") { diff --git a/multimedia/image_framework/include/image_pixel_map_mdk.h b/multimedia/image_framework/include/image_pixel_map_mdk.h index 2fd6f9f22..1bd622bc6 100644 --- a/multimedia/image_framework/include/image_pixel_map_mdk.h +++ b/multimedia/image_framework/include/image_pixel_map_mdk.h @@ -19,7 +19,7 @@ * * @brief Provides APIs for obtaining pixel map data and information. * - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 1.0 */ @@ -31,7 +31,7 @@ * Need link libpixelmapndk.z.so * * @library libpixelmap_ndk.so - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @kit ImageKit * @since 10 * @version 1.0 -- Gitee From 538420289bf14ea991926af1dbae378f52ba6227 Mon Sep 17 00:00:00 2001 From: wuchengwen Date: Tue, 6 May 2025 20:47:30 +0800 Subject: [PATCH 38/71] fix:capi path Signed-off-by: wuchengwen --- inputmethod/BUILD.gn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/inputmethod/BUILD.gn b/inputmethod/BUILD.gn index cc1480cdb..479df0f87 100644 --- a/inputmethod/BUILD.gn +++ b/inputmethod/BUILD.gn @@ -20,15 +20,15 @@ ohos_ndk_library("libohinputmethod") { min_compact_version = "12" system_capability = "SystemCapability.MiscServices.InputMethodFramework" system_capability_headers = [ - "./inputmethod/inputmethod_controller_capi.h", - "./inputmethod/inputmethod_attach_options_capi.h", - "./inputmethod/inputmethod_cursor_info_capi.h", - "./inputmethod/inputmethod_inputmethod_proxy_capi.h", - "./inputmethod/inputmethod_private_command_capi.h", - "./inputmethod/inputmethod_text_avoid_info_capi.h", - "./inputmethod/inputmethod_text_config_capi.h", - "./inputmethod/inputmethod_text_editor_proxy_capi.h", - "./inputmethod/inputmethod_types_capi.h", + "inputmethod/inputmethod_controller_capi.h", + "inputmethod/inputmethod_attach_options_capi.h", + "inputmethod/inputmethod_cursor_info_capi.h", + "inputmethod/inputmethod_inputmethod_proxy_capi.h", + "inputmethod/inputmethod_private_command_capi.h", + "inputmethod/inputmethod_text_avoid_info_capi.h", + "inputmethod/inputmethod_text_config_capi.h", + "inputmethod/inputmethod_text_editor_proxy_capi.h", + "inputmethod/inputmethod_types_capi.h", ] } -- Gitee From 0136c594937383d78788c86f3a9d3647ad5c5337 Mon Sep 17 00:00:00 2001 From: Zenix Date: Tue, 6 May 2025 21:25:58 +0800 Subject: [PATCH 39/71] Change19 Signed-off-by: Zenix --- arkui/ace_engine/native/drag_and_drop.h | 6 +++--- arkui/ace_engine/native/libace.ndk.json | 6 +++--- arkui/ace_engine/native/native_type.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index c49081767..fc7605580 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -855,7 +855,7 @@ int32_t OH_ArkUI_StartDrag(ArkUI_DragAction* dragAction); * 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_DROP_OPERATION_NOT_ALLOWED} if current is not during the drop handing. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_DragEvent_RequestDragEndPending(ArkUI_DragEvent* event, int32_t* requestIdentify); @@ -870,7 +870,7 @@ int32_t OH_ArkUI_DragEvent_RequestDragEndPending(ArkUI_DragEvent* event, int32_t * 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_DROP_OPERATION_NOT_ALLOWED} if current is not during the drop handing. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_NotifyDragResult(int32_t requestIdentify, ArkUI_DragResult result); @@ -882,7 +882,7 @@ int32_t OH_ArkUI_NotifyDragResult(int32_t requestIdentify, ArkUI_DragResult resu * 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_DROP_OPERATION_NOT_ALLOWED} if current is not during the drop handing. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_NotifyDragEndPendingDone(int32_t requestIdentify); diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 3a129e851..e6a694d0a 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3016,15 +3016,15 @@ "name": "OH_ArkUI_AxisEvent_GetScrollStep" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_DragEvent_RequestDragEndPending" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_NotifyDragResult" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_NotifyDragEndPendingDone" }, { diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index ff4522e3c..ce7fd0c22 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -2249,7 +2249,7 @@ typedef enum { ARKUI_ERROR_CODE_RECOGNIZER_TYPE_NOT_SUPPORTED = 180102, /** * @error operation is not allowed for current drag drop pharse. - * @since 18 + * @since 19 */ ARKUI_ERROR_CODE_DRAG_DROP_OPERATION_NOT_ALLOWED = 190004, } ArkUI_ErrorCode; -- Gitee From 29b201dd6066e9bd765e1f25f38756cc5c53ab73 Mon Sep 17 00:00:00 2001 From: liumingyue Date: Tue, 6 May 2025 20:57:59 +0800 Subject: [PATCH 40/71] =?UTF-8?q?C=20API=E6=96=87=E4=BB=B6SystemCapability?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liumingyue --- bundlemanager/bundle_framework/bundle/BUILD.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundlemanager/bundle_framework/bundle/BUILD.gn b/bundlemanager/bundle_framework/bundle/BUILD.gn index 1a834d911..22dfebfab 100644 --- a/bundlemanager/bundle_framework/bundle/BUILD.gn +++ b/bundlemanager/bundle_framework/bundle/BUILD.gn @@ -25,4 +25,6 @@ ohos_ndk_library("libbundle_ndk") { ndk_description_file = "./libbundle.ndk.json" min_compact_version = "9" output_name = "bundle_ndk" -} \ No newline at end of file + system_capability = "SystemCapability.BundleManager.BundleFramework.Core" + system_capability_headers = [ "bundle/native_interface_bundle.h" ] +} -- Gitee From 91c193f68d9f6e880f862b2dcab1f8e6c23ca47e Mon Sep 17 00:00:00 2001 From: yangwenxin Date: Tue, 6 May 2025 22:05:51 +0800 Subject: [PATCH 41/71] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangwenxin --- arkui/window_manager/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arkui/window_manager/BUILD.gn b/arkui/window_manager/BUILD.gn index b06760b56..0e5b250e5 100644 --- a/arkui/window_manager/BUILD.gn +++ b/arkui/window_manager/BUILD.gn @@ -21,9 +21,9 @@ ohos_ndk_library("native_window_manager") { output_extension = "so" system_capability = "SystemCapability.Window.SessionManager" system_capability_headers = [ - "oh_window.h", - "oh_window_comm.h", - "oh_window_event_filter.h", + "window_manager/oh_window.h", + "window_manager/oh_window_comm.h", + "window_manager/oh_window_event_filter.h", ] } -- Gitee From 6b59b3a9c67426127d71f560af58a359301c1359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=B8=85=E4=BA=91?= Date: Tue, 6 May 2025 22:13:31 +0800 Subject: [PATCH 42/71] =?UTF-8?q?NODE=5FBACKGROUND=5FIMAGE=5FRESIZABLE=5FW?= =?UTF-8?q?ITH=5FSLICE=20=E4=BF=AE=E6=94=B9=E4=B8=BAAPI19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 胡清云 --- arkui/ace_engine/native/native_node.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 38f0dfe69..c6d24128e 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1891,7 +1891,7 @@ typedef enum { * .value[2].f32: width of the right edge. The unit is vp. \n * .value[3].f32: width of the bottom edge. The unit is vp. \n * - * @since 18 + * @since 19 */ NODE_BACKGROUND_IMAGE_RESIZABLE_WITH_SLICE = 100, -- Gitee From bc615b4240f2281732c8511dbc59ed0b8dcaf44b Mon Sep 17 00:00:00 2001 From: liukaii Date: Tue, 6 May 2025 22:32:40 +0800 Subject: [PATCH 43/71] change api 19 Signed-off-by: liukaii --- arkui/ace_engine/native/libace.ndk.json | 6 +++--- arkui/ace_engine/native/native_key_event.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 3a129e851..c85340d71 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3300,15 +3300,15 @@ "name": "OH_ArkUI_XComponent_IsInitialized" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_KeyEvent_IsNumLockOn" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_KeyEvent_IsCapsLockOn" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_KeyEvent_IsScrollLockOn" }, { diff --git a/arkui/ace_engine/native/native_key_event.h b/arkui/ace_engine/native/native_key_event.h index 34a568953..c18b311d3 100644 --- a/arkui/ace_engine/native/native_key_event.h +++ b/arkui/ace_engine/native/native_key_event.h @@ -574,7 +574,7 @@ void OH_ArkUI_KeyEvent_Dispatch(ArkUI_NodeHandle node, 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. - * @since 18 + * @since 19 */ ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsNumLockOn(const ArkUI_UIInputEvent* event, bool* state); @@ -586,7 +586,7 @@ ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsNumLockOn(const ArkUI_UIInputEvent* event, b * @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. - * @since 18 + * @since 19 */ ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsCapsLockOn(const ArkUI_UIInputEvent* event, bool* state); @@ -598,7 +598,7 @@ ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsCapsLockOn(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. - * @since 18 + * @since 19 */ ArkUI_ErrorCode OH_ArkUI_KeyEvent_IsScrollLockOn(const ArkUI_UIInputEvent* event, bool* state); #ifdef __cplusplus -- Gitee From ff75296f8dc1eadf4aa02c1f2d931aedd013c49b Mon Sep 17 00:00:00 2001 From: surencong Date: Tue, 6 May 2025 22:40:50 +0800 Subject: [PATCH 44/71] modify commit of commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h Signed-off-by: surencong --- .../libpurgeablemem/purgeable_memory.h | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h b/commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h index 2f9cb9ef2..7d6f0ba11 100644 --- a/commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h +++ b/commonlibrary/memory_utils/libpurgeablemem/purgeable_memory.h @@ -50,7 +50,7 @@ extern "C" { #endif /* End of #ifdef __cplusplus */ -/* +/** * @brief Purgeable mem struct * * @since 10 @@ -58,12 +58,12 @@ extern "C" { */ typedef struct PurgMem OH_PurgeableMemory; -/* +/** * @brief: function pointer, it points to a function which is used to build content of a PurgMem obj. * * * @param void *: data ptr, points to start address of a PurgMem obj's content. - * @param size_t: data size of the content. + * @param size_t Data size of the content. * @param void *: other private parameters. * @return: build content result, true means success, while false is fail. * @@ -72,13 +72,13 @@ typedef struct PurgMem OH_PurgeableMemory; */ typedef bool (*OH_PurgeableMemory_ModifyFunc)(void *, size_t, void *); -/* +/** * @brief: create a PurgMem obj. * * - * @param size: data size of a PurgMem obj's content. - * @param func: function pointer, it is used to recover data when the PurgMem obj's content is purged. - * @param funcPara: parameters used by @func. + * @param size Data size of a PurgMem obj's content. + * @param func Function pointer, it is used to recover data when the PurgMem obj's content is purged. + * @param funcPara Parameters used by @func. * @return: a PurgMem obj. * * @since 10 @@ -87,11 +87,11 @@ typedef bool (*OH_PurgeableMemory_ModifyFunc)(void *, size_t, void *); OH_PurgeableMemory *OH_PurgeableMemory_Create( size_t size, OH_PurgeableMemory_ModifyFunc func, void *funcPara); -/* +/** * @brief: destroy a PurgMem obj. * * - * @param purgObj: a PurgMem obj to be destroyed. + * @param purgObj A PurgMem obj to be destroyed. * @return: true is success, while false is fail. return true if @purgObj is NULL. * If return true, @purgObj will be set to NULL to avoid Use-After-Free. * @@ -100,11 +100,11 @@ OH_PurgeableMemory *OH_PurgeableMemory_Create( */ bool OH_PurgeableMemory_Destroy(OH_PurgeableMemory *purgObj); -/* +/** * @brief: begin read a PurgMem obj. * * - * @param purgObj: a PurgMem obj. + * @param purgObj A PurgMem obj. * @return: return true if @purgObj's content is present. * If content is purged(no present), system will recover its data, * return false if content is purged and recovered failed. @@ -117,11 +117,11 @@ bool OH_PurgeableMemory_Destroy(OH_PurgeableMemory *purgObj); */ bool OH_PurgeableMemory_BeginRead(OH_PurgeableMemory *purgObj); -/* +/** * @brief: end read a PurgMem obj. * * - * @param purgObj: a PurgMem obj. + * @param purgObj A PurgMem obj. * OS may reclaim the memory of @purgObj's content * at a later time when this function returns. * @@ -130,11 +130,11 @@ bool OH_PurgeableMemory_BeginRead(OH_PurgeableMemory *purgObj); */ void OH_PurgeableMemory_EndRead(OH_PurgeableMemory *purgObj); -/* +/** * @brief: begin write a PurgMem obj. * * - * @param purgObj: a PurgMem obj. + * @param purgObj A PurgMem obj. * @return: return true if @purgObj's content is present. * if content is purged(no present), system will recover its data, * return false if content is purged and recovered failed. @@ -147,11 +147,11 @@ void OH_PurgeableMemory_EndRead(OH_PurgeableMemory *purgObj); */ bool OH_PurgeableMemory_BeginWrite(OH_PurgeableMemory *purgObj); -/* +/** * @brief: end write a PurgMem obj. * * - * @param purgObj: a PurgMem obj. + * @param purgObj A PurgMem obj. * OS may reclaim the memory of @purgObj's content * at a later time when this function returns. * @@ -160,11 +160,11 @@ bool OH_PurgeableMemory_BeginWrite(OH_PurgeableMemory *purgObj); */ void OH_PurgeableMemory_EndWrite(OH_PurgeableMemory *purgObj); -/* +/** * @brief: get content ptr of a PurgMem obj. * * - * @param purgObj: a PurgMem obj. + * @param purgObj A PurgMem obj. * @return: return start address of a PurgMem obj's content. * Return NULL if @purgObj is NULL. * This function should be protect by PurgMemBeginRead()/PurgMemEndRead() @@ -175,11 +175,11 @@ void OH_PurgeableMemory_EndWrite(OH_PurgeableMemory *purgObj); */ void *OH_PurgeableMemory_GetContent(OH_PurgeableMemory *purgObj); -/* +/** * @brief: get content size of a PurgMem obj. * * - * @param purgObj: a PurgMem obj. + * @param purgObj A PurgMem obj. * @return: return content size of @purgObj. * Return 0 if @purgObj is NULL. * @@ -188,14 +188,13 @@ void *OH_PurgeableMemory_GetContent(OH_PurgeableMemory *purgObj); */ size_t OH_PurgeableMemory_ContentSize(OH_PurgeableMemory *purgObj); -/* +/** * @brief: append a modify to a PurgMem obj. * * - * @param purgObj: a PurgMem obj. - * @param size: data size of a PurgMem obj's content. - * @param func: function pointer, it will modify content of @PurgMem. - * @param funcPara: parameters used by @func. + * @param purgObj A PurgMem obj. + * @param func Function pointer, it will modify content of @PurgMem. + * @param funcPara Parameters used by @func. * @return: append result, true is success, while false is fail. * * @since 10 -- Gitee From 27abc641dfdd450d72e65cfdea474e3828973ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BA=E6=99=A8=E9=9F=AC?= Date: Tue, 6 May 2025 23:26:18 +0800 Subject: [PATCH 45/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9distanceMapapi=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 贺晨韬 --- arkui/ace_engine/native/libace.ndk.json | 4 ++-- arkui/ace_engine/native/native_gesture.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 3a129e851..f12c8f92a 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3312,11 +3312,11 @@ "name": "OH_ArkUI_KeyEvent_IsScrollLockOn" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_PanGesture_SetDistanceMap" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_PanGesture_GetDistanceByToolType" } ] \ No newline at end of file diff --git a/arkui/ace_engine/native/native_gesture.h b/arkui/ace_engine/native/native_gesture.h index f8dbf864a..aa4b37c23 100644 --- a/arkui/ace_engine/native/native_gesture.h +++ b/arkui/ace_engine/native/native_gesture.h @@ -847,7 +847,7 @@ int32_t OH_ArkUI_GetGestureParam_distanceThreshold(ArkUI_GestureRecognizer* reco * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. * Returns {@link ARKUI_ERROR_CODE_RECOGNIZER_TYPE_NOT_SUPPORTED} if the gesture recognizer type is * not supported. -* @since 18 +* @since 19 */ ArkUI_ErrorCode OH_ArkUI_PanGesture_SetDistanceMap( ArkUI_GestureRecognizer* recognizer, int size, int* toolTypeArray, double* distanceArray); @@ -863,7 +863,7 @@ ArkUI_ErrorCode OH_ArkUI_PanGesture_SetDistanceMap( * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter exception occurs. * Returns {@link ARKUI_ERROR_CODE_RECOGNIZER_TYPE_NOT_SUPPORTED} if the gesture recognizer type is * not supported. -* @since 18 +* @since 19 */ ArkUI_ErrorCode OH_ArkUI_PanGesture_GetDistanceByToolType( ArkUI_GestureRecognizer* recognizer, int toolType, double* distance); -- Gitee From 7d869dec2328a30ca65bfbf697b7747493def968 Mon Sep 17 00:00:00 2001 From: "@ran-zhao-yu" Date: Wed, 7 May 2025 09:29:33 +0800 Subject: [PATCH 46/71] =?UTF-8?q?syscap=E6=8E=92=E6=9F=A5=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @ran-zhao-yu --- global/resource_management/BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/global/resource_management/BUILD.gn b/global/resource_management/BUILD.gn index 3db518153..6087ba8c7 100644 --- a/global/resource_management/BUILD.gn +++ b/global/resource_management/BUILD.gn @@ -17,6 +17,12 @@ ohos_ndk_library("librawfile_ndk") { ndk_description_file = "./librawfile.ndk.json" min_compact_version = "1" output_name = "rawfile" + system_capability = "SystemCapability.Global.ResourceManager" + system_capability_headers = [ + "rawfile/raw_dir.h", + "rawfile/raw_file.h", + "rawfile/raw_file_manager.h", + ] } ohos_ndk_headers("rawfile_header") { -- Gitee From f9e5c563a3a9ceb2f76dccaa96cbcc260b5bfa6d Mon Sep 17 00:00:00 2001 From: renzhixian Date: Tue, 6 May 2025 21:16:03 +0800 Subject: [PATCH 47/71] fix: pasteboard build config Signed-off-by: renzhixian --- distributeddatamgr/pasteboard/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distributeddatamgr/pasteboard/BUILD.gn b/distributeddatamgr/pasteboard/BUILD.gn index 4cdf98a13..1c80213ef 100644 --- a/distributeddatamgr/pasteboard/BUILD.gn +++ b/distributeddatamgr/pasteboard/BUILD.gn @@ -30,7 +30,7 @@ ohos_ndk_library("libpasteboard") { ndk_description_file = "./libpasteboard.ndk.json" min_compact_version = "13" system_capability_headers = [ - "$ndk_headers_out_dir/database/pasteboard/oh_pasteboard.h", - "$ndk_headers_out_dir/database/pasteboard/oh_pasteboard_err_code.h", + "database/pasteboard/oh_pasteboard.h", + "database/pasteboard/oh_pasteboard_err_code.h", ] } -- Gitee From 97ad751c10aba2fd4fb7f75cd686771e2b41e9c4 Mon Sep 17 00:00:00 2001 From: liuyifei Date: Wed, 7 May 2025 01:43:35 +0000 Subject: [PATCH 48/71] =?UTF-8?q?hilog=20syscap=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuyifei --- hiviewdfx/hilog/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/hiviewdfx/hilog/BUILD.gn b/hiviewdfx/hilog/BUILD.gn index 1d6816c60..64550630c 100644 --- a/hiviewdfx/hilog/BUILD.gn +++ b/hiviewdfx/hilog/BUILD.gn @@ -18,6 +18,7 @@ ohos_ndk_library("libhilog_ndk") { ndk_description_file = "./libhilog.ndk.json" min_compact_version = "1" system_capability = "SystemCapability.HiviewDFX.HiLog" + system_capability_headers = [ "hilog/log.h" ] } ohos_ndk_headers("hilog_header") { -- Gitee From 7362f6f9c243168c6bffb09be830d75b20488b56 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 6 May 2025 21:15:52 +0800 Subject: [PATCH 49/71] add graphic error code Signed-off-by: lihui --- graphic/graphic_2d/native_buffer/BUILD.gn | 5 ++++- graphic/graphic_2d/native_buffer/buffer_common.h | 3 +-- graphic/graphic_2d/native_window/BUILD.gn | 1 + graphic/graphic_2d/native_window/graphic_error_code.h | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/graphic/graphic_2d/native_buffer/BUILD.gn b/graphic/graphic_2d/native_buffer/BUILD.gn index 9d589b7c2..121f876a3 100644 --- a/graphic/graphic_2d/native_buffer/BUILD.gn +++ b/graphic/graphic_2d/native_buffer/BUILD.gn @@ -28,5 +28,8 @@ ohos_ndk_library("libnative_buffer_ndk") { output_extension = "so" ndk_description_file = "./libnative_buffer.ndk.json" system_capability = "SystemCapability.Graphic.Graphic2D.NativeBuffer" - system_capability_headers = [ "native_buffer/native_buffer.h" ] + system_capability_headers = [ + "native_buffer/native_buffer.h", + "native_buffer/buffer_common.h", + ] } diff --git a/graphic/graphic_2d/native_buffer/buffer_common.h b/graphic/graphic_2d/native_buffer/buffer_common.h index 20b22fd87..752da7f9f 100644 --- a/graphic/graphic_2d/native_buffer/buffer_common.h +++ b/graphic/graphic_2d/native_buffer/buffer_common.h @@ -19,13 +19,12 @@ * * @brief Provides the common types for native buffer. * - * @syscap SystemCapability.Graphic.Graphic2D.NativeBuffer * @since 12 * @version 1.0 */ /** - * @file native_buffer.h + * @file buffer_common.h * * @brief Defines the common types for native buffer. * diff --git a/graphic/graphic_2d/native_window/BUILD.gn b/graphic/graphic_2d/native_window/BUILD.gn index 054fc6b6d..d76796b1f 100644 --- a/graphic/graphic_2d/native_window/BUILD.gn +++ b/graphic/graphic_2d/native_window/BUILD.gn @@ -31,5 +31,6 @@ ohos_ndk_library("libnative_window_ndk") { system_capability_headers = [ "native_window/buffer_handle.h", "native_window/external_window.h", + "native_window/graphic_error_code.h", ] } diff --git a/graphic/graphic_2d/native_window/graphic_error_code.h b/graphic/graphic_2d/native_window/graphic_error_code.h index fe1df86f5..820636e08 100644 --- a/graphic/graphic_2d/native_window/graphic_error_code.h +++ b/graphic/graphic_2d/native_window/graphic_error_code.h @@ -19,13 +19,12 @@ * * @brief Provides the error codes for native window. * - * @syscap SystemCapability.Graphic.Graphic2D.NativeWindow * @since 12 * @version 1.0 */ /** - * @file external_window.h + * @file graphic_error_code.h * * @brief Defines the error codes. * -- Gitee From 8abeabc9b1e5b7df9adb11827e9fba0f75e262ef Mon Sep 17 00:00:00 2001 From: y00656910 Date: Mon, 5 May 2025 15:16:31 +0800 Subject: [PATCH 50/71] add cropRegion interface Signed-off-by: y00656910 Change-Id: Ia4a5a5f760ac92e590da7166b294f24a25613f5d Signed-off-by: y00656910 --- .../include/image/image_common.h | 5 ++++ .../include/image/image_source_native.h | 24 +++++++++++++++++++ .../image_framework/libimage_source.ndk.json | 8 +++++++ 3 files changed, 37 insertions(+) diff --git a/multimedia/image_framework/include/image/image_common.h b/multimedia/image_framework/include/image/image_common.h index d17f95a5d..753fddaeb 100644 --- a/multimedia/image_framework/include/image/image_common.h +++ b/multimedia/image_framework/include/image/image_common.h @@ -203,6 +203,11 @@ typedef enum { * @since 15 */ IMAGE_SOURCE_UNSUPPORTED_OPTIONS = 7700203, + /** + * @error Invalid parameter. + * @since 19 + */ + IMAGE_SOURCE_INVALID_PARAMETER = 7700204, /** decode failed */ IMAGE_DECODE_FAILED = 7700301, /** diff --git a/multimedia/image_framework/include/image/image_source_native.h b/multimedia/image_framework/include/image/image_source_native.h index faa192067..43000f092 100644 --- a/multimedia/image_framework/include/image/image_source_native.h +++ b/multimedia/image_framework/include/image/image_source_native.h @@ -362,6 +362,30 @@ Image_ErrorCode OH_DecodingOptions_GetCropAndScaleStrategy(OH_DecodingOptions *o Image_ErrorCode OH_DecodingOptions_SetDesiredDynamicRange(OH_DecodingOptions *options, int32_t desiredDynamicRange); +/** + * @brief Sets the crop region for the decoding options. + * + * @param options Pointer to the decoding options. + * @param cropRegion The target region will be cropped from the image. + * @return Returns one of the following result codes: + * {@link IMAGE_SUCCESS} if the execution is successful. + * {@link IMAGE_SOURCE_INVALID_PARAMETER} if options or cropRegion is null pointer. + * @since 19 + */ +Image_ErrorCode OH_DecodingOptions_SetCropRegion(OH_DecodingOptions *options, Image_Region *cropRegion); + +/** + * @brief Gets the crop region for the decoding options. + * + * @param options Pointer to the decoding options. + * @param cropRegion The target region will be cropped from the image. + * @return Returns one of the following result codes: + * {@link IMAGE_SUCCESS} if the execution is successful. + * {@link IMAGE_SOURCE_INVALID_PARAMETER} if options or cropRegion is null pointer. + * @since 19 + */ +Image_ErrorCode OH_DecodingOptions_GetCropRegion(OH_DecodingOptions *options, Image_Region *cropRegion); + /** * @brief delete OH_DecodingOptions pointer. * diff --git a/multimedia/image_framework/libimage_source.ndk.json b/multimedia/image_framework/libimage_source.ndk.json index ca6fab1a3..104bb376a 100644 --- a/multimedia/image_framework/libimage_source.ndk.json +++ b/multimedia/image_framework/libimage_source.ndk.json @@ -79,6 +79,14 @@ "first_introduced": "18", "name": "OH_DecodingOptions_GetCropAndScaleStrategy" }, + { + "first_introduced": "19", + "name": "OH_DecodingOptions_SetCropRegion" + }, + { + "first_introduced": "19", + "name": "OH_DecodingOptions_GetCropRegion" + }, { "first_introduced": "12", "name": "OH_DecodingOptions_Release" -- Gitee From aba2350feaad6cb873cfd2c3578d5f7cb5372161 Mon Sep 17 00:00:00 2001 From: wenjinchao Date: Wed, 7 May 2025 11:10:25 +0800 Subject: [PATCH 51/71] fix-sys-cap Signed-off-by: wenjinchao --- distributeddatamgr/udmf/BUILD.gn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/distributeddatamgr/udmf/BUILD.gn b/distributeddatamgr/udmf/BUILD.gn index 9dc8f7a62..ac3a410b8 100644 --- a/distributeddatamgr/udmf/BUILD.gn +++ b/distributeddatamgr/udmf/BUILD.gn @@ -33,10 +33,10 @@ ohos_ndk_library("libudmf") { ndk_description_file = "./libudmf.ndk.json" min_compact_version = "12" system_capability_headers = [ - "$ndk_headers_out_dir/database/udmf/udmf_err_code.h", - "$ndk_headers_out_dir/database/udmf/udmf_meta.h", - "$ndk_headers_out_dir/database/udmf/udmf.h", - "$ndk_headers_out_dir/database/udmf/uds.h", - "$ndk_headers_out_dir/database/udmf/utd.h", + "database/udmf/udmf_err_code.h", + "database/udmf/udmf_meta.h", + "database/udmf/udmf.h", + "database/udmf/uds.h", + "database/udmf/utd.h", ] } -- Gitee From 0aa4dc26afa3cee5d6dbf67454484ec2353a2123 Mon Sep 17 00:00:00 2001 From: bailu1992 Date: Wed, 7 May 2025 11:24:52 +0800 Subject: [PATCH 52/71] Revised syscap in header files Signed-off-by: bailu1992 --- sensors/miscdevice/vibrator/BUILD.gn | 5 +++++ sensors/sensor/BUILD.gn | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sensors/miscdevice/vibrator/BUILD.gn b/sensors/miscdevice/vibrator/BUILD.gn index d843b2d08..e73f0d6b6 100644 --- a/sensors/miscdevice/vibrator/BUILD.gn +++ b/sensors/miscdevice/vibrator/BUILD.gn @@ -25,4 +25,9 @@ ohos_ndk_library("lib_vibrator_ndk") { output_name = "ohvibrator" ndk_description_file = "./lib_vibrator.ndk.json" min_compact_version = "11" + system_capability = "SystemCapability.Sensors.MiscDevice" + system_capability_headers = [ + "sensors/vibrator_type.h", + "sensors/vibrator.h", + ] } diff --git a/sensors/sensor/BUILD.gn b/sensors/sensor/BUILD.gn index 8a12ddf2a..594835f9d 100644 --- a/sensors/sensor/BUILD.gn +++ b/sensors/sensor/BUILD.gn @@ -27,4 +27,9 @@ ohos_ndk_library("libsensor_ndk") { output_name = "ohsensor" output_extension = "so" min_compact_version = "11" + system_capability = "SystemCapability.Sensors.Sensor" + system_capability_headers = [ + "sensors/oh_sensor_type.h", + "sensors/oh_sensor.h", + ] } -- Gitee From 582163877ae058ac060c357dda5904bf8dece1c3 Mon Sep 17 00:00:00 2001 From: sunbees Date: Wed, 7 May 2025 14:38:49 +0800 Subject: [PATCH 53/71] change xcomponent surface holder api to 19 Signed-off-by: sunbees Change-Id: I9b2d08545ece112a9317cb5853791b7d2f406c41 --- arkui/ace_engine/native/libace.ndk.json | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 3a129e851..308b9963a 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3236,67 +3236,67 @@ "name": "OH_ArkUI_TextCascadePickerRangeContentArray_Destroy" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceHolder_Create" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceHolder_Dispose" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceHolder_SetUserData" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceHolder_GetUserData" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceCallback_Create" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceCallback_Dispose" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceCallback_SetSurfaceCreatedEvent" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceCallback_SetSurfaceChangedEvent" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceCallback_SetSurfaceDestroyedEvent" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceHolder_AddSurfaceCallback" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_SurfaceHolder_RemoveSurfaceCallback" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_XComponent_GetNativeWindow" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_XComponent_SetAutoInitialize" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_XComponent_Initialize" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_XComponent_Finalize" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_XComponent_IsInitialized" }, { -- Gitee From e47582aafed0e2f6a233524d9aa942f3afdeb1fd Mon Sep 17 00:00:00 2001 From: buzhenwang Date: Wed, 7 May 2025 15:58:43 +0800 Subject: [PATCH 54/71] =?UTF-8?q?sdk=5Fc=E6=95=B4=E6=94=B9=20Signed-off-by?= =?UTF-8?q?:leiguangyu=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: buzhenwang --- hiviewdfx/hitrace/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/hiviewdfx/hitrace/BUILD.gn b/hiviewdfx/hitrace/BUILD.gn index 00086c79a..447857ac7 100644 --- a/hiviewdfx/hitrace/BUILD.gn +++ b/hiviewdfx/hitrace/BUILD.gn @@ -18,6 +18,7 @@ ohos_ndk_library("libhitrace_ndk") { ndk_description_file = "./libhitrace.ndk.json" min_compact_version = "1" system_capability = "SystemCapability.HiviewDFX.HiTrace" + system_capability_headers = [ "hitrace/trace.h" ] } ohos_ndk_headers("hitrace_header") { -- Gitee From 6ad1cd26c43842efe82cbcb023573ea3d4a160bf Mon Sep 17 00:00:00 2001 From: zhou_xq Date: Wed, 7 May 2025 16:55:34 +0800 Subject: [PATCH 55/71] =?UTF-8?q?hiappevent=20=E5=A4=B4=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=85=B3=E4=BA=8ESystemCapability=E7=9A=84=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhou_xq --- hiviewdfx/hiappevent/BUILD.gn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hiviewdfx/hiappevent/BUILD.gn b/hiviewdfx/hiappevent/BUILD.gn index 9a0c41b0c..2720fb5e3 100644 --- a/hiviewdfx/hiappevent/BUILD.gn +++ b/hiviewdfx/hiappevent/BUILD.gn @@ -18,6 +18,12 @@ ohos_ndk_library("libhiappevent_ndk") { ndk_description_file = "./libhiappevent.ndk.json" min_compact_version = "1" system_capability = "SystemCapability.HiviewDFX.HiAppEvent" + system_capability_headers = [ + "hiappevent/hiappevent.h", + "hiappevent/hiappevent_cfg.h", + "hiappevent/hiappevent_event.h", + "hiappevent/hiappevent_param.h", + ] } ohos_ndk_headers("libhiappevent_header") { -- Gitee From 4ee0116e3173910b824c0a9e4e28d1a02c291c97 Mon Sep 17 00:00:00 2001 From: hui Date: Wed, 7 May 2025 18:58:42 +0800 Subject: [PATCH 56/71] change syscap Signed-off-by: hui --- ConnectivityKit/bluetooth/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConnectivityKit/bluetooth/BUILD.gn b/ConnectivityKit/bluetooth/BUILD.gn index 869366f31..9f21ff227 100644 --- a/ConnectivityKit/bluetooth/BUILD.gn +++ b/ConnectivityKit/bluetooth/BUILD.gn @@ -25,5 +25,5 @@ ohos_ndk_library("libbluetooth_ndk") { output_extension = "so" min_compact_version = "13" system_capability = "SystemCapability.Communication.Bluetooth.Core" - system_capability_headers = [ "./oh_bluetooth.h" ] + system_capability_headers = [ "ConnectivityKit/bluetooth/oh_bluetooth.h" ] } -- Gitee From d9fc2ec371c225c923f8030833a55bf29fe11c75 Mon Sep 17 00:00:00 2001 From: yang-junfeng0621 Date: Wed, 7 May 2025 22:06:42 +0800 Subject: [PATCH 57/71] =?UTF-8?q?0507=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yang-junfeng0621 --- security/huks/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/security/huks/BUILD.gn b/security/huks/BUILD.gn index 4a8d8ea12..c146c10ca 100644 --- a/security/huks/BUILD.gn +++ b/security/huks/BUILD.gn @@ -21,9 +21,9 @@ ohos_ndk_library("libhuks_ndk") { system_capability = "SystemCapability.Security.Huks" system_capability_headers = [ - "./include/native_huks_api.h", - "./include/native_huks_param.h", - "./include/native_huks_type.h", + "huks/native_huks_api.h", + "huks/native_huks_param.h", + "huks/native_huks_type.h", ] } -- Gitee From 43eebd750fb72fc2fba739a7b94ea5a9d7122296 Mon Sep 17 00:00:00 2001 From: huchao Date: Thu, 8 May 2025 11:22:54 +0800 Subject: [PATCH 58/71] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=A1=86=E6=9E=B6sysca?= =?UTF-8?q?p=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huchao --- multimedia/image_framework/BUILD.gn | 20 +++++++++++++++++-- .../image_framework/include/image_mdk.h | 4 ++-- .../include/image_mdk_common.h | 4 ++-- .../include/image_packer_mdk.h | 2 +- .../include/image_pixel_map_napi.h | 4 ++-- .../include/image_receiver_mdk.h | 4 ++-- .../include/image_source_mdk.h | 4 ++-- 7 files changed, 29 insertions(+), 13 deletions(-) diff --git a/multimedia/image_framework/BUILD.gn b/multimedia/image_framework/BUILD.gn index d7786b5a3..0dd62b74e 100644 --- a/multimedia/image_framework/BUILD.gn +++ b/multimedia/image_framework/BUILD.gn @@ -18,8 +18,10 @@ ohos_ndk_library("libpixelmap_ndk") { min_compact_version = "1" output_name = "pixelmap_ndk" system_capability = "SystemCapability.Multimedia.Image.Core" - system_capability_headers = - [ "multimedia/image_framework/image_pixel_map_mdk.h" ] + system_capability_headers = [ + "multimedia/image_framework/image_pixel_map_mdk.h", + "multimedia/image_framework/image_pixel_map_napi.h", + ] } ohos_ndk_headers("image_header") { @@ -83,6 +85,11 @@ ohos_ndk_library("libimage_ndk") { ndk_description_file = "./libimage_ndk.ndk.json" min_compact_version = "1" output_name = "image_ndk" + system_capability = "SystemCapability.Multimedia.Image.Core" + system_capability_headers = [ + "multimedia/image_framework/image_mdk.h", + "multimedia/image_framework/image_mdk_common.h", + ] } ohos_ndk_headers("image_ndk_header") { @@ -97,6 +104,9 @@ ohos_ndk_library("libimage_receiver_ndk") { ndk_description_file = "./libimage_receiver_ndk.ndk.json" min_compact_version = "1" output_name = "image_receiver_ndk" + system_capability = "SystemCapability.Multimedia.Image.Core" + system_capability_headers = + [ "multimedia/image_framework/image_receiver_mdk.h" ] } ohos_ndk_headers("image_receiver_ndk_header") { @@ -108,6 +118,9 @@ ohos_ndk_library("libimage_source_ndk") { ndk_description_file = "./libimage_source_ndk.ndk.json" min_compact_version = "1" output_name = "image_source_ndk" + system_capability = "SystemCapability.Multimedia.Image.Core" + system_capability_headers = + [ "multimedia/image_framework/image_source_mdk.h" ] } ohos_ndk_headers("image_source_ndk_header") { @@ -135,6 +148,9 @@ ohos_ndk_headers("libimage_source_header") { ohos_ndk_library("libimage_packer_ndk") { ndk_description_file = "./libimage_packer_ndk.ndk.json" output_name = "image_packer_ndk" + system_capability = "SystemCapability.Multimedia.Image.Core" + system_capability_headers = + [ "multimedia/image_framework/image_packer_mdk.h" ] } ohos_ndk_headers("image_packer_ndk_header") { diff --git a/multimedia/image_framework/include/image_mdk.h b/multimedia/image_framework/include/image_mdk.h index 053fbde05..47a9ca07c 100644 --- a/multimedia/image_framework/include/image_mdk.h +++ b/multimedia/image_framework/include/image_mdk.h @@ -19,7 +19,7 @@ * * @brief Provides APIs for access to the image interface. * - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 2.0 */ @@ -32,7 +32,7 @@ * * @library libimage_ndk.z.so * @kit ImageKit - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 2.0 */ diff --git a/multimedia/image_framework/include/image_mdk_common.h b/multimedia/image_framework/include/image_mdk_common.h index c34252403..d9b7493a8 100644 --- a/multimedia/image_framework/include/image_mdk_common.h +++ b/multimedia/image_framework/include/image_mdk_common.h @@ -19,7 +19,7 @@ * * @brief Provides APIs for access to the image interface. * - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 2.0 */ @@ -31,7 +31,7 @@ * * @kit ImageKit * @library libimage_ndk.z.so - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 2.0 */ diff --git a/multimedia/image_framework/include/image_packer_mdk.h b/multimedia/image_framework/include/image_packer_mdk.h index c7783cfc0..be9c73fa5 100644 --- a/multimedia/image_framework/include/image_packer_mdk.h +++ b/multimedia/image_framework/include/image_packer_mdk.h @@ -42,7 +42,7 @@ * * @library libimage_packer_ndk.z.so * @kit ImageKit - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 11 * @version 4.1 */ diff --git a/multimedia/image_framework/include/image_pixel_map_napi.h b/multimedia/image_framework/include/image_pixel_map_napi.h index 91328b45e..d5ec68290 100644 --- a/multimedia/image_framework/include/image_pixel_map_napi.h +++ b/multimedia/image_framework/include/image_pixel_map_napi.h @@ -19,7 +19,7 @@ * * @brief Provides APIs for obtaining pixel map data and information. * - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 8 * @version 1.0 */ @@ -30,7 +30,7 @@ * @brief Declares the APIs that can lock, access, and unlock a pixel map. * * @library libpixelmap_ndk.so - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @kit ImageKit * @since 8 * @version 1.0 diff --git a/multimedia/image_framework/include/image_receiver_mdk.h b/multimedia/image_framework/include/image_receiver_mdk.h index 9f90dc947..a8ebee884 100644 --- a/multimedia/image_framework/include/image_receiver_mdk.h +++ b/multimedia/image_framework/include/image_receiver_mdk.h @@ -19,7 +19,7 @@ * * @brief Provides APIs for obtaining image data from the native layer. * - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 2.0 */ @@ -32,7 +32,7 @@ * * @library libimage_receiver_ndk.z.so * @kit ImageKit - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 2.0 */ diff --git a/multimedia/image_framework/include/image_source_mdk.h b/multimedia/image_framework/include/image_source_mdk.h index 35278f5aa..b9095e998 100644 --- a/multimedia/image_framework/include/image_source_mdk.h +++ b/multimedia/image_framework/include/image_source_mdk.h @@ -19,7 +19,7 @@ * * @brief Provides native APIs for image sources. * - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 4.0 */ @@ -31,7 +31,7 @@ * * @library libimage_source_ndk.z.so * @kit ImageKit - * @syscap SystemCapability.Multimedia.Image + * @syscap SystemCapability.Multimedia.Image.Core * @since 10 * @version 4.0 */ -- Gitee From 4f428dd1c5a49d84c9128be11f0d69a2e95de1bb Mon Sep 17 00:00:00 2001 From: zhuyinlin <1085905529@qq.com> Date: Thu, 8 May 2025 15:58:02 +0800 Subject: [PATCH 59/71] =?UTF-8?q?CAPI=E5=A4=B4=E6=96=87=E4=BB=B6=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: zhuyinlin <1085905529@qq.com> --- ai/neural_network_runtime/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ai/neural_network_runtime/BUILD.gn b/ai/neural_network_runtime/BUILD.gn index 66b4fa143..25323444c 100644 --- a/ai/neural_network_runtime/BUILD.gn +++ b/ai/neural_network_runtime/BUILD.gn @@ -20,8 +20,8 @@ ohos_ndk_library("libneural_network_core_ndk") { min_compact_version = "11" system_capability = "SystemCapability.AI.NeuralNetworkRuntime" system_capability_headers = [ - "neural_network_core.h", - "neural_network_runtime_type.h", + "neural_network_runtime/neural_network_core.h", + "neural_network_runtime/neural_network_runtime_type.h", ] } @@ -32,8 +32,8 @@ ohos_ndk_library("libneural_network_runtime_ndk") { min_compact_version = "9" system_capability = "SystemCapability.AI.NeuralNetworkRuntime" system_capability_headers = [ - "neural_network_runtime.h", - "neural_network_runtime_type.h", + "neural_network_runtime/neural_network_runtime.h", + "neural_network_runtime/neural_network_runtime_type.h", ] } -- Gitee From cf035b50b4c30af0f57fb87aa4f7421e0ec6824d Mon Sep 17 00:00:00 2001 From: zhanghang Date: Thu, 8 May 2025 16:28:31 +0800 Subject: [PATCH 60/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang --- arkui/ace_engine/native/libace.ndk.json | 78 +++++++++++----------- arkui/ace_engine/native/native_dialog.h | 86 ++++++++++++------------- arkui/ace_engine/native/native_type.h | 20 +++--- 3 files changed, 92 insertions(+), 92 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 308b9963a..7ec34624e 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3072,107 +3072,107 @@ "name": "OH_ArkUI_NodeUtils_GetPositionToParent" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_CreateOptions" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_DisposeOptions" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetLevelMode" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetLevelUniqueId" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetImmersiveMode" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_OpenDialog" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_UpdateDialog" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_CloseDialog" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetBackgroundColor" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetCornerRadius" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetBorderWidth" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetBorderColor" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetBorderStyle" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetWidth" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetHeight" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetShadow" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetCustomShadow" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetBackgroundBlurStyle" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetAlignment" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetModalMode" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetAutoCancel" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetSubwindowMode" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetMask" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetKeyboardAvoidMode" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetHoverModeEnabled" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetHoverModeArea" }, { @@ -3184,55 +3184,55 @@ "name": "OH_ArkUI_CustomDialog_SetBackgroundEffect" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_RegisterOnWillDismissCallback" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_RegisterOnWillAppearCallback" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_RegisterOnDidAppearCallback" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_RegisterOnWillDisappearCallback" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_RegisterOnDidDisappearCallback" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextPickerRangeContentArray_Create" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextPickerRangeContentArray_SetIconAtIndex" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextPickerRangeContentArray_SetTextAtIndex" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextPickerRangeContentArray_Destroy" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextCascadePickerRangeContentArray_Create" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextCascadePickerRangeContentArray_SetTextAtIndex" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextCascadePickerRangeContentArray_SetChildAtIndex" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_TextCascadePickerRangeContentArray_Destroy" }, { diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index a9967b8e6..0f6f20879 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -102,7 +102,7 @@ typedef struct ArkUI_DialogDismissEvent ArkUI_DialogDismissEvent; /** * @brief Defines a struct for the content object of a custom dialog box. * - * @since 18 + * @since 19 */ typedef struct ArkUI_CustomDialogOptions ArkUI_CustomDialogOptions; @@ -486,7 +486,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setBorderWidth)( ArkUI_NativeDialogHandle handle, float top, float right, float bottom, float left, ArkUI_LengthMetricUnit unit); @@ -503,7 +503,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setBorderColor)( ArkUI_NativeDialogHandle handle, uint32_t top, uint32_t right, uint32_t bottom, uint32_t left); @@ -520,7 +520,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setBorderStyle)( ArkUI_NativeDialogHandle handle, int32_t top, int32_t right, int32_t bottom, int32_t left); @@ -535,7 +535,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setWidth)(ArkUI_NativeDialogHandle handle, float width, ArkUI_LengthMetricUnit unit); @@ -549,7 +549,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setHeight)(ArkUI_NativeDialogHandle handle, float height, ArkUI_LengthMetricUnit unit); @@ -562,7 +562,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setShadow)(ArkUI_NativeDialogHandle handle, ArkUI_ShadowStyle shadow); @@ -575,7 +575,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setCustomShadow)(ArkUI_NativeDialogHandle handle, const ArkUI_AttributeItem* customShadow); @@ -588,7 +588,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setBackgroundBlurStyle)(ArkUI_NativeDialogHandle handle, ArkUI_BlurStyle blurStyle); @@ -601,7 +601,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*setKeyboardAvoidMode)(ArkUI_NativeDialogHandle handle, ArkUI_KeyboardAvoidMode keyboardAvoidMode); @@ -614,7 +614,7 @@ typedef struct { * @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 occur.. - * @since 18 + * @since 19 */ int32_t (*enableHoverMode)(ArkUI_NativeDialogHandle handle, bool enableHoverMode); @@ -627,7 +627,7 @@ typedef struct { * @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 occur. - * @since 18 + * @since 19 */ int32_t (*setHoverModeArea)(ArkUI_NativeDialogHandle handle, ArkUI_HoverModeAreaType hoverModeAreaType); @@ -736,7 +736,7 @@ int32_t OH_ArkUI_DialogDismissEvent_GetDismissReason(ArkUI_DialogDismissEvent* e * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_OpenDialog(ArkUI_CustomDialogOptions* options, void (*callback)(int32_t dialogId)); @@ -748,7 +748,7 @@ int32_t OH_ArkUI_CustomDialog_OpenDialog(ArkUI_CustomDialogOptions* options, voi * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_UpdateDialog(ArkUI_CustomDialogOptions* options, void (*callback)(int32_t dialogId)); @@ -759,7 +759,7 @@ int32_t OH_ArkUI_CustomDialog_UpdateDialog(ArkUI_CustomDialogOptions* options, v * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_CloseDialog(int32_t dialogId); @@ -768,7 +768,7 @@ int32_t OH_ArkUI_CustomDialog_CloseDialog(int32_t dialogId); * * @param content Content of the custom dialog box. * @return Returns the pointer to the custom dialog box options. - * @since 18 + * @since 19 */ ArkUI_CustomDialogOptions* OH_ArkUI_CustomDialog_CreateOptions(ArkUI_NodeHandle content); @@ -776,7 +776,7 @@ ArkUI_CustomDialogOptions* OH_ArkUI_CustomDialog_CreateOptions(ArkUI_NodeHandle * @brief Destroys the custom dialog box options. * * @param options The pointer to the custom dialog box options. - * @since 18 + * @since 19 */ void OH_ArkUI_CustomDialog_DisposeOptions(ArkUI_CustomDialogOptions* options); @@ -789,7 +789,7 @@ void OH_ArkUI_CustomDialog_DisposeOptions(ArkUI_CustomDialogOptions* options); * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetLevelMode(ArkUI_CustomDialogOptions* options, ArkUI_LevelMode levelMode); @@ -801,7 +801,7 @@ int32_t OH_ArkUI_CustomDialog_SetLevelMode(ArkUI_CustomDialogOptions* options, A * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetLevelUniqueId(ArkUI_CustomDialogOptions* options, int32_t uniqueId); @@ -814,7 +814,7 @@ int32_t OH_ArkUI_CustomDialog_SetLevelUniqueId(ArkUI_CustomDialogOptions* option * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetImmersiveMode(ArkUI_CustomDialogOptions* options, ArkUI_ImmersiveMode immersiveMode); @@ -826,7 +826,7 @@ int32_t OH_ArkUI_CustomDialog_SetImmersiveMode(ArkUI_CustomDialogOptions* option * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetBackgroundColor(ArkUI_CustomDialogOptions* options, uint32_t backgroundColor); @@ -841,7 +841,7 @@ int32_t OH_ArkUI_CustomDialog_SetBackgroundColor(ArkUI_CustomDialogOptions* opti * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetCornerRadius( ArkUI_CustomDialogOptions* options, float topLeft, float topRight, float bottomLeft, float bottomRight); @@ -858,7 +858,7 @@ int32_t OH_ArkUI_CustomDialog_SetCornerRadius( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetBorderWidth( ArkUI_CustomDialogOptions* options, float top, float right, float bottom, float left, ArkUI_LengthMetricUnit unit); @@ -874,7 +874,7 @@ int32_t OH_ArkUI_CustomDialog_SetBorderWidth( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetBorderColor( ArkUI_CustomDialogOptions* options, uint32_t top, uint32_t right, uint32_t bottom, uint32_t left); @@ -890,7 +890,7 @@ int32_t OH_ArkUI_CustomDialog_SetBorderColor( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetBorderStyle( ArkUI_CustomDialogOptions* options, int32_t top, int32_t right, int32_t bottom, int32_t left); @@ -904,7 +904,7 @@ int32_t OH_ArkUI_CustomDialog_SetBorderStyle( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetWidth(ArkUI_CustomDialogOptions* options, float width, ArkUI_LengthMetricUnit unit); @@ -917,7 +917,7 @@ int32_t OH_ArkUI_CustomDialog_SetWidth(ArkUI_CustomDialogOptions* options, float * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetHeight(ArkUI_CustomDialogOptions* options, float height, ArkUI_LengthMetricUnit unit); @@ -929,7 +929,7 @@ int32_t OH_ArkUI_CustomDialog_SetHeight(ArkUI_CustomDialogOptions* options, floa * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetShadow(ArkUI_CustomDialogOptions* options, ArkUI_ShadowStyle shadow); @@ -941,7 +941,7 @@ int32_t OH_ArkUI_CustomDialog_SetShadow(ArkUI_CustomDialogOptions* options, ArkU * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetCustomShadow( ArkUI_CustomDialogOptions* options, const ArkUI_AttributeItem* customShadow); @@ -954,7 +954,7 @@ int32_t OH_ArkUI_CustomDialog_SetCustomShadow( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetBackgroundBlurStyle(ArkUI_CustomDialogOptions* options, ArkUI_BlurStyle blurStyle); @@ -968,7 +968,7 @@ int32_t OH_ArkUI_CustomDialog_SetBackgroundBlurStyle(ArkUI_CustomDialogOptions* * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetAlignment( ArkUI_CustomDialogOptions* options, int32_t alignment, float offsetX, float offsetY); @@ -982,7 +982,7 @@ int32_t OH_ArkUI_CustomDialog_SetAlignment( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetModalMode(ArkUI_CustomDialogOptions* options, bool isModal); @@ -995,7 +995,7 @@ int32_t OH_ArkUI_CustomDialog_SetModalMode(ArkUI_CustomDialogOptions* options, b * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetAutoCancel(ArkUI_CustomDialogOptions* options, bool autoCancel); @@ -1009,7 +1009,7 @@ int32_t OH_ArkUI_CustomDialog_SetAutoCancel(ArkUI_CustomDialogOptions* options, * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetSubwindowMode(ArkUI_CustomDialogOptions* options, bool showInSubwindow); @@ -1023,7 +1023,7 @@ int32_t OH_ArkUI_CustomDialog_SetSubwindowMode(ArkUI_CustomDialogOptions* option * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetMask( ArkUI_CustomDialogOptions* options, uint32_t maskColor, const ArkUI_Rect* maskRect); @@ -1036,7 +1036,7 @@ int32_t OH_ArkUI_CustomDialog_SetMask( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetKeyboardAvoidMode( ArkUI_CustomDialogOptions* options, ArkUI_KeyboardAvoidMode keyboardAvoidMode); @@ -1049,7 +1049,7 @@ int32_t OH_ArkUI_CustomDialog_SetKeyboardAvoidMode( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetHoverModeEnabled(ArkUI_CustomDialogOptions* options, bool enabled); @@ -1061,7 +1061,7 @@ int32_t OH_ArkUI_CustomDialog_SetHoverModeEnabled(ArkUI_CustomDialogOptions* opt * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetHoverModeArea( ArkUI_CustomDialogOptions* options, ArkUI_HoverModeAreaType hoverModeAreaType); @@ -1075,7 +1075,7 @@ int32_t OH_ArkUI_CustomDialog_SetHoverModeArea( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_RegisterOnWillDismissCallback( ArkUI_CustomDialogOptions* options, void* userData, void (*callback)(ArkUI_DialogDismissEvent* event)); @@ -1089,7 +1089,7 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnWillDismissCallback( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_RegisterOnWillAppearCallback( ArkUI_CustomDialogOptions* options, void* userData, void (*callback)(void* userData)); @@ -1103,7 +1103,7 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnWillAppearCallback( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_RegisterOnDidAppearCallback( ArkUI_CustomDialogOptions* options, void* userData, void (*callback)(void* userData)); @@ -1117,7 +1117,7 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnDidAppearCallback( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_RegisterOnWillDisappearCallback( ArkUI_CustomDialogOptions* options, void* userData, void (*callback)(void* userData)); @@ -1131,7 +1131,7 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnWillDisappearCallback( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_RegisterOnDidDisappearCallback( ArkUI_CustomDialogOptions* options, void* userData, void (*callback)(void* userData)); diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 2aabe73d2..c8694d5f8 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -2608,14 +2608,14 @@ typedef struct ArkUI_SnapshotOptions ArkUI_SnapshotOptions; /** * @brief TextPicker single column selector, supports mixing text and images. * - * @since 18 + * @since 19 */ typedef struct ArkUI_TextPickerRangeContentArray ArkUI_TextPickerRangeContentArray; /** * @brief TextPicker multi column selector, supports mixing text and images. * - * @since 18 + * @since 19 */ typedef struct ArkUI_TextCascadePickerRangeContentArray ArkUI_TextCascadePickerRangeContentArray; @@ -5056,7 +5056,7 @@ int32_t OH_ArkUI_VisibleAreaEventOptions_GetExpectedUpdateInterval(ArkUI_Visible * *@param length The length of the picker array. *@return Returns a TextPickerRangeContent instance. - *@since 18 + *@since 19 */ ArkUI_TextPickerRangeContentArray* OH_ArkUI_TextPickerRangeContentArray_Create(int32_t length); @@ -5066,7 +5066,7 @@ ArkUI_TextPickerRangeContentArray* OH_ArkUI_TextPickerRangeContentArray_Create(i *@param handle The TextPickerRangeContent instance for obtaining information. *@param icon Icon addreass. *@param index The index position of the value to be obtained. - *@since 18 + *@since 19 */ void OH_ArkUI_TextPickerRangeContentArray_SetIconAtIndex( ArkUI_TextPickerRangeContentArray* handle, char* icon, int32_t index); @@ -5077,7 +5077,7 @@ void OH_ArkUI_TextPickerRangeContentArray_SetIconAtIndex( *@param handle The TextPickerRangeContent instance for obtaining information. *@param text Text content *@param index The index position of the value to be obtained. - *@since 18 + *@since 19 */ void OH_ArkUI_TextPickerRangeContentArray_SetTextAtIndex( ArkUI_TextPickerRangeContentArray* handle, char* text, int32_t index); @@ -5086,7 +5086,7 @@ void OH_ArkUI_TextPickerRangeContentArray_SetTextAtIndex( *@brief Destroy the TextPickerRangeContent instance. * *@param handle The TextPickerRangeContent instance for obtaining information. - *@since 18 + *@since 19 */ void OH_ArkUI_TextPickerRangeContentArray_Destroy(ArkUI_TextPickerRangeContentArray* handle); @@ -5095,7 +5095,7 @@ void OH_ArkUI_TextPickerRangeContentArray_Destroy(ArkUI_TextPickerRangeContentAr * *@param length The length of the picker array. *@return Returns a TextCascadePickerRangeContent instance. - *@since 18 + *@since 19 */ ArkUI_TextCascadePickerRangeContentArray* OH_ArkUI_TextCascadePickerRangeContentArray_Create(int32_t length); @@ -5105,7 +5105,7 @@ ArkUI_TextCascadePickerRangeContentArray* OH_ArkUI_TextCascadePickerRangeContent *@param handle The TextCascadePickerRangeContent instance for obtaining information. *@param text text content *@param index The index position of the value to be obtained. - *@since 18 + *@since 19 */ void OH_ArkUI_TextCascadePickerRangeContentArray_SetTextAtIndex( ArkUI_TextCascadePickerRangeContentArray* handle, char* text, int32_t index); @@ -5116,7 +5116,7 @@ void OH_ArkUI_TextCascadePickerRangeContentArray_SetTextAtIndex( *@param handle The TextCascadePickerRangeContent instance for obtaining information. *@param child The child instance. *@param index The index position of the value to be obtained. - *@since 18 + *@since 19 */ void OH_ArkUI_TextCascadePickerRangeContentArray_SetChildAtIndex( ArkUI_TextCascadePickerRangeContentArray* handle, ArkUI_TextCascadePickerRangeContentArray* child, int32_t index); @@ -5125,7 +5125,7 @@ void OH_ArkUI_TextCascadePickerRangeContentArray_SetChildAtIndex( *@brief Destroy the TextCascadePickerRangeContent instance. * *@param handle The TextCascadePickerRangeContent instance for obtaining information. - *@since 18 + *@since 19 */ void OH_ArkUI_TextCascadePickerRangeContentArray_Destroy(ArkUI_TextCascadePickerRangeContentArray* handle); #ifdef __cplusplus -- Gitee From 41ed81836c4b728ba4ce7bd59c4409f6ac5b1988 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Thu, 8 May 2025 16:43:05 +0800 Subject: [PATCH 61/71] =?UTF-8?q?Dialog=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E8=83=8C=E6=99=AF=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=2018=E6=94=B919?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang --- arkui/ace_engine/native/libace.ndk.json | 4 ++-- arkui/ace_engine/native/native_dialog.h | 8 ++++---- arkui/ace_engine/native/native_type.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 308b9963a..0b4f8d140 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -3176,11 +3176,11 @@ "name": "OH_ArkUI_CustomDialog_SetHoverModeArea" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetBackgroundBlurStyleOptions" }, { - "first_introduced": "18", + "first_introduced": "19", "name": "OH_ArkUI_CustomDialog_SetBackgroundEffect" }, { diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index a9967b8e6..dc3d6cd19 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -662,7 +662,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*setBackgroundBlurStyleOptions)( ArkUI_NativeDialogHandle handle, const ArkUI_AttributeItem* backgroundBlurStyleOptions); @@ -688,7 +688,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*setBackgroundEffect)(ArkUI_NativeDialogHandle handle, const ArkUI_AttributeItem* backgroundEffect); } ArkUI_NativeDialogAPI_3; @@ -1153,7 +1153,7 @@ int32_t OH_ArkUI_CustomDialog_RegisterOnDidDisappearCallback( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetBackgroundBlurStyleOptions( ArkUI_CustomDialogOptions* options, const ArkUI_AttributeItem* backgroundBlurStyleOptions); @@ -1177,7 +1177,7 @@ int32_t OH_ArkUI_CustomDialog_SetBackgroundBlurStyleOptions( * @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. - * @since 18 + * @since 19 */ int32_t OH_ArkUI_CustomDialog_SetBackgroundEffect( ArkUI_CustomDialogOptions* options, const ArkUI_AttributeItem* backgroundEffect); diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 2aabe73d2..4868e16bc 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -1167,7 +1167,7 @@ typedef enum { /** * @brief Enumerates the activation policies for the background blur effect. * - * @since 18 + * @since 19 */ typedef enum { /** The blur effect changes according to the window's focus state; -- Gitee From 09c65d2fe0538137414831aff6d9cc74a0f682d5 Mon Sep 17 00:00:00 2001 From: shihaojie Date: Thu, 8 May 2025 17:36:35 +0800 Subject: [PATCH 62/71] =?UTF-8?q?=E5=A4=B4=E6=96=87=E4=BB=B6syscap?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shihaojie --- ConnectivityKit/wifi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConnectivityKit/wifi/BUILD.gn b/ConnectivityKit/wifi/BUILD.gn index 19812ca5c..57eef5360 100644 --- a/ConnectivityKit/wifi/BUILD.gn +++ b/ConnectivityKit/wifi/BUILD.gn @@ -25,5 +25,5 @@ ohos_ndk_library("libwifi_ndk") { output_extension = "so" min_compact_version = "13" system_capability = "SystemCapability.Communication.WiFi.STA" - system_capability_headers = [ "./oh_wifi.h" ] + system_capability_headers = [ "wifi/oh_wifi.h" ] } -- Gitee From eba8c1abe1f915c973cf581bd7983ebec235a28e Mon Sep 17 00:00:00 2001 From: liuxinbing Date: Thu, 8 May 2025 11:05:37 +0000 Subject: [PATCH 63/71] update LocationKit/BUILD.gn. Signed-off-by: liuxinbing --- LocationKit/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LocationKit/BUILD.gn b/LocationKit/BUILD.gn index b5718e151..4befb797b 100644 --- a/LocationKit/BUILD.gn +++ b/LocationKit/BUILD.gn @@ -29,7 +29,7 @@ ohos_ndk_library("liblocation_ndk") { min_compact_version = "13" system_capability = "SystemCapability.Location.Location.Core" system_capability_headers = [ - "./oh_location.h", - "./oh_location_type.h", + "LocationKit/oh_location.h", + "LocationKit/oh_location_type.h", ] } -- Gitee From 9c3758091fd28f41a3e3440eee77b6df48585d3c Mon Sep 17 00:00:00 2001 From: FTL1ght Date: Thu, 13 Mar 2025 21:32:53 +0800 Subject: [PATCH 64/71] Add new interface about badge type. Signed-off-by: FTL1ght --- .../native_drawing/drawing_text_typography.h | 26 +++++++++++++++++++ .../native_drawing/libnative_drawing.ndk.json | 4 +++ 2 files changed, 30 insertions(+) diff --git a/graphic/graphic_2d/native_drawing/drawing_text_typography.h b/graphic/graphic_2d/native_drawing/drawing_text_typography.h index 966621728..c9488e97e 100644 --- a/graphic/graphic_2d/native_drawing/drawing_text_typography.h +++ b/graphic/graphic_2d/native_drawing/drawing_text_typography.h @@ -577,6 +577,21 @@ enum OH_Drawing_FontWidth { FONT_WIDTH_ULTRA_EXPANDED = 9, }; +/** + * @brief Type of badge. + * + * @since 20 + * @version 1.0 + */ +typedef enum OH_Drawing_TextBadgeType { + /* No badge */ + TEXT_BADGE_NONE, + /* Super badge */ + TEXT_SUPERSCRIPT, + /* Sub badge */ + TEXT_SUBSCRIPT, +} OH_Drawing_TextBadgeType; + /** * @brief Defines the font style struct. * @@ -2899,6 +2914,17 @@ void OH_Drawing_SetTypographyTextTab(OH_Drawing_TypographyStyle* style, OH_Drawi */ size_t OH_Drawing_GetDrawingArraySize(OH_Drawing_Array* drawingArray); +/** + * @brief Set text badge type. + * + * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing + * @param style Indicates the pointer to an OH_Drawing_TextStyle object. + * @param textBageType The type of text badge. + * @since 20 + * @version 1.0 + */ +void OH_Drawing_SetTextStyleBadgeType(OH_Drawing_TextStyle* style, OH_Drawing_TextBadgeType textBageType); + #ifdef __cplusplus } #endif diff --git a/graphic/graphic_2d/native_drawing/libnative_drawing.ndk.json b/graphic/graphic_2d/native_drawing/libnative_drawing.ndk.json index e13687d42..d39f4f1c0 100644 --- a/graphic/graphic_2d/native_drawing/libnative_drawing.ndk.json +++ b/graphic/graphic_2d/native_drawing/libnative_drawing.ndk.json @@ -1793,5 +1793,9 @@ { "first_introduced": "18", "name": "OH_Drawing_CanvasDrawPixelMapNine" + }, + { + "first_introduced": "20", + "name": "OH_Drawing_SetTextStyleBadgeType" } ] \ No newline at end of file -- Gitee From 46e6f52f9331185b5b82f3dd260b9ffed59922a7 Mon Sep 17 00:00:00 2001 From: cheerful_ricky Date: Fri, 9 May 2025 11:07:39 +0800 Subject: [PATCH 65/71] revert new error code in master Signed-off-by: cheerful_ricky --- BasicServicesKit/commonevent/oh_commonevent.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/BasicServicesKit/commonevent/oh_commonevent.h b/BasicServicesKit/commonevent/oh_commonevent.h index ea252db50..a5b93c498 100644 --- a/BasicServicesKit/commonevent/oh_commonevent.h +++ b/BasicServicesKit/commonevent/oh_commonevent.h @@ -59,13 +59,6 @@ typedef enum CommonEvent_ErrCode { /** @error invalid input parameter. */ COMMONEVENT_ERR_INVALID_PARAMETER = 401, - /** - * @error The common event send frequency too high. - * - * @since 19 - */ - COMMONEVENT_ERR_SENDING_LIMIT_EXCEEDED = 1500003, - /** @error the application cannot send system common events. */ COMMONEVENT_ERR_NOT_SYSTEM_SERVICE = 1500004, @@ -634,7 +627,6 @@ CommonEvent_ErrCode OH_CommonEvent_SetDoubleArrayToParameters(CommonEvent_Parame * @return Returns the error code. * Returns {@link COMMONEVENT_ERR_OK} if the operation is successful. * Returns {@link COMMONEVENT_ERR_INVALID_PARAMETER} if a parameter error occurs. - * Returns {@link COMMONEVENT_ERR_SENDING_LIMIT_EXCEEDED} if the common event sending frequency too high. * Returns {@link COMMONEVENT_ERR_FAIL_SEND_REQUEST } if IPC request failed to send. * Returns {@link COMMONEVENT_ERR_INIT_UNDONE } if ces not init done. * @since 18 @@ -649,7 +641,6 @@ CommonEvent_ErrCode OH_CommonEvent_Publish(const char* event); * @return Returns the error code. * Returns {@link COMMONEVENT_ERR_OK} if the operation is successful. * Returns {@link COMMONEVENT_ERR_INVALID_PARAMETER} if a parameter error occurs. - * Returns {@link COMMONEVENT_ERR_SENDING_LIMIT_EXCEEDED} if the common event sending frequency too high. * Returns {@link COMMONEVENT_ERR_FAIL_SEND_REQUEST } if IPC request failed to send. * Returns {@link COMMONEVENT_ERR_INIT_UNDONE } if ces not init done. * @since 18 -- Gitee From 7d1670f69f6221f17a7b13386fd538ada95b180e Mon Sep 17 00:00:00 2001 From: b30058220 Date: Fri, 9 May 2025 20:21:55 +0800 Subject: [PATCH 66/71] =?UTF-8?q?getPreDragStatus=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: b30058220 --- arkui/ace_engine/native/drag_and_drop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index c49081767..8e26e7a36 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -559,7 +559,7 @@ int32_t OH_ArkUI_AllowNodeAllDropDataTypes(ArkUI_NodeHandle node); * @brief Sets whether the specified component is draggable. * * @param node Indicates the pointer to a component node. - * @param bool Indicates whether the component is draggable. + * @param enabled Indicates whether the component is draggable. * @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. -- Gitee From 4943fbb6e49f3b0cab8c0cca0e690a8e1d949814 Mon Sep 17 00:00:00 2001 From: houguobiao Date: Sat, 10 May 2025 15:05:15 +0800 Subject: [PATCH 67/71] =?UTF-8?q?Dialog=E7=BB=84=E4=BB=B6API=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: houguobiao Change-Id: I72c90a517a91f3f0f5667dddb4f133b52fc1d996 --- arkui/ace_engine/native/native_dialog.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index ed4f86344..bf7d63a01 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -389,19 +389,19 @@ typedef struct { * @brief Provides the custom dialog box APIs for the native side. * * @version 3 - * @since 18 + * @since 19 */ typedef struct { /** * @brief Provides the custom dialog box APIs for the native side. The API scope is {@link ArkUI_NativeDialogAPI_1} * - * @since 18 + * @since 19 */ ArkUI_NativeDialogAPI_1 nativeDialogAPI1; /** * @brief Provides the custom dialog box APIs for the native side. The API scope is {@link ArkUI_NativeDialogAPI_2} * - * @since 18 + * @since 19 */ ArkUI_NativeDialogAPI_2 nativeDialogAPI2; /** @@ -413,7 +413,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*setLevelOrder)(ArkUI_NativeDialogHandle handle, double levelOrder); /** @@ -639,7 +639,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*setFocusable)(ArkUI_NativeDialogHandle handle, bool focusable); -- Gitee From f3982f42df7aaee57930553da1d3c17deb2c0b08 Mon Sep 17 00:00:00 2001 From: yangbiao199318 Date: Sat, 10 May 2025 16:36:41 +0800 Subject: [PATCH 68/71] fix:dialog update Signed-off-by: yangbiao199318 --- arkui/ace_engine/native/native_dialog.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arkui/ace_engine/native/native_dialog.h b/arkui/ace_engine/native/native_dialog.h index bf7d63a01..f6ffbeb68 100644 --- a/arkui/ace_engine/native/native_dialog.h +++ b/arkui/ace_engine/native/native_dialog.h @@ -425,7 +425,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*registerOnWillAppear)( @@ -440,7 +440,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*registerOnDidAppear)( ArkUI_NativeDialogHandle handle, void* userData, void (*callback)(void* userData)); @@ -454,7 +454,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*registerOnWillDisappear)( ArkUI_NativeDialogHandle handle, void* userData, void (*callback)(void* userData)); @@ -468,7 +468,7 @@ typedef struct { * @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. - * @since 18 + * @since 19 */ int32_t (*registerOnDidDisappear)( ArkUI_NativeDialogHandle handle, void* userData, void (*callback)(void* userData)); -- Gitee From 226305a63f788dab3afa0fd89bc32b95e2eeb28d Mon Sep 17 00:00:00 2001 From: zzz701 Date: Sun, 11 May 2025 16:58:52 +0800 Subject: [PATCH 69/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96Api?= =?UTF-8?q?=E5=AD=90=E7=89=88=E6=9C=AC=EF=BC=8Cpatch=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20OH=5FGetSdkApiMinorVersion=20OH=5FGetSdkAp?= =?UTF-8?q?iPatchVersion=EF=BC=8C=E7=89=88=E6=9C=AC=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3isApiVersionGreaterOrEqual?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zzz701 --- startup/init/syscap/include/deviceinfo.h | 14 ++++++++++++++ startup/init/syscap/include/syscap_ndk.h | 12 ++++++++++++ startup/init/syscap/libdeviceinfo.ndk.json | 3 +++ 3 files changed, 29 insertions(+) diff --git a/startup/init/syscap/include/deviceinfo.h b/startup/init/syscap/include/deviceinfo.h index 05f1bbd2b..30cf04665 100644 --- a/startup/init/syscap/include/deviceinfo.h +++ b/startup/init/syscap/include/deviceinfo.h @@ -157,6 +157,20 @@ const char *OH_GetOSFullName(void); */ int OH_GetSdkApiVersion(void); +/** + * Obtains the SDK Minor API version number. + * @syscap SystemCapability.Startup.SystemInfo + * @since 19 + */ +int OH_GetSdkMinorApiVersion(void); + +/** + * Obtains the SDK Patch API version number. + * @syscap SystemCapability.Startup.SystemInfo + * @since 19 + */ +int OH_GetSdkPatchApiVersion(void); + /** * Obtains the first API version number. * @syscap SystemCapability.Startup.SystemInfo diff --git a/startup/init/syscap/include/syscap_ndk.h b/startup/init/syscap/include/syscap_ndk.h index a52f30603..c57a0dfe8 100644 --- a/startup/init/syscap/include/syscap_ndk.h +++ b/startup/init/syscap/include/syscap_ndk.h @@ -44,6 +44,18 @@ extern "C" { bool canIUse(const char *cap); +/** + * @brief api version is greater or same than the given version. + * + * @param majorVersion The major version number + * @param minorVersion The minor version number + * @param patchVersion The patch version number + * @return true if api version is greater or same than the given version; + * otherwise false. + * @since 19 + */ +bool isApiVersionGreaterOrEqual(int majorVersion, int minorVersion, int patchVersion); + #ifdef __cplusplus #if __cplusplus } diff --git a/startup/init/syscap/libdeviceinfo.ndk.json b/startup/init/syscap/libdeviceinfo.ndk.json index dfed92796..0d1beef88 100644 --- a/startup/init/syscap/libdeviceinfo.ndk.json +++ b/startup/init/syscap/libdeviceinfo.ndk.json @@ -1,5 +1,6 @@ [ {"name": "canIUse"}, + {"name": "isApiVersionGreaterOrEqual"}, {"name": "OH_GetDeviceType"}, {"name": "OH_GetManufacture"}, {"name": "OH_GetBrand"}, @@ -16,6 +17,8 @@ {"name": "OH_GetOsReleaseType"}, {"name": "OH_GetOSFullName"}, {"name": "OH_GetSdkApiVersion"}, + {"name": "OH_GetSdkMinorApiVersion"}, + {"name": "OH_GetSdkPatchApiVersion"}, {"name": "OH_GetFirstApiVersion"}, {"name": "OH_GetVersionId"}, {"name": "OH_GetBuildType"}, -- Gitee From 99e4abf89b7f5823063fd69e0cb6fbf4f5daa147 Mon Sep 17 00:00:00 2001 From: shihaojie Date: Mon, 12 May 2025 03:30:18 +0000 Subject: [PATCH 70/71] 1 Signed-off-by: shihaojie --- ConnectivityKit/wifi/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConnectivityKit/wifi/BUILD.gn b/ConnectivityKit/wifi/BUILD.gn index 57eef5360..5e8b5d185 100644 --- a/ConnectivityKit/wifi/BUILD.gn +++ b/ConnectivityKit/wifi/BUILD.gn @@ -25,5 +25,5 @@ ohos_ndk_library("libwifi_ndk") { output_extension = "so" min_compact_version = "13" system_capability = "SystemCapability.Communication.WiFi.STA" - system_capability_headers = [ "wifi/oh_wifi.h" ] + system_capability_headers = [ "ConnectivityKit/wifi/oh_wifi.h" ] } -- Gitee From 365723712fc1e2d36264a609a61d843e944a1b67 Mon Sep 17 00:00:00 2001 From: wangxiuxiu96 Date: Thu, 3 Apr 2025 11:14:27 +0800 Subject: [PATCH 71/71] longpressApi Signed-off-by: wangxiuxiu96 Change-Id: I32e434d4f916186f2d5ae674ac84151373a21629 --- arkui/ace_engine/native/native_node.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index c3fb83c32..758b25ac7 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -6670,6 +6670,15 @@ typedef enum { * */ NODE_TEXT_ON_DETECT_RESULT_UPDATE = MAX_NODE_SCOPE_NUM * ARKUI_NODE_TEXT, + /** + * @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 + * @since 20 + */ + NODE_TEXT_SPAN_ON_LONG_PRESS = 1001, /** * @brief Defines the image loading success event. * -- Gitee