From ec83e18321a68001e4265c8ffba2c604a44eb1d9 Mon Sep 17 00:00:00 2001 From: wujinhui Date: Tue, 19 Aug 2025 15:59:29 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=9B=9E=E9=80=80api21=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wujinhui --- arkui/ace_engine/native/libace.ndk.json | 4 ---- arkui/ace_engine/native/native_node.h | 15 --------------- 2 files changed, 19 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 4a896d6404f..3c739a283d0 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -1559,10 +1559,6 @@ "first_introduced": "18", "name": "OH_ArkUI_NodeUtils_MoveTo" }, - { - "first_introduced": "21", - "name": "OH_ArkUI_NativeModule_InvalidateAttributes" - }, { "first_introduced": "15", "name": "OH_ArkUI_NodeUtils_SetCrossLanguageOption" diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index ce5b57eb466..50ede589c7f 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -9893,21 +9893,6 @@ int32_t OH_ArkUI_NodeUtils_GetAttachedNodeHandleById(const char* id, ArkUI_NodeH */ int32_t OH_ArkUI_NodeUtils_MoveTo(ArkUI_NodeHandle node, ArkUI_NodeHandle target_parent, int32_t index); -/** - * @brief Triggers node updates in the current frame. - * When node attributes are modified after the current frame's build phase (i.e., after - * the unified processing of dirty nodes), the node updates will be deferred to the next - * frame. This function forces immediate node updates within the current frame to - * ensure rendering effects are applied synchronously. - * - * @param node ArkUI_NodeHandle pointer. - * @return Error code. - * {@link ARKUI_ERROR_CODE_NO_ERROR} Success. - * {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function parameter exception. - * @since 21 - */ -int32_t OH_ArkUI_NativeModule_InvalidateAttributes(ArkUI_NodeHandle node); - /** * @brief Set the cross-language option of the target node handle. * -- Gitee From a6fc122b727503485ff2a67275a517bad333aa64 Mon Sep 17 00:00:00 2001 From: huangtianyu Date: Tue, 19 Aug 2025 10:09:42 +0000 Subject: [PATCH 2/8] ResetLoudnessGain Signed-off-by: huangtianyu --- multimedia/player_framework/lowpower_audio_sink.h | 14 -------------- .../lowpower_avsink/liblowpower_avsink.ndk.json | 4 ---- 2 files changed, 18 deletions(-) diff --git a/multimedia/player_framework/lowpower_audio_sink.h b/multimedia/player_framework/lowpower_audio_sink.h index 07f24a29998..226f1f17a29 100644 --- a/multimedia/player_framework/lowpower_audio_sink.h +++ b/multimedia/player_framework/lowpower_audio_sink.h @@ -258,20 +258,6 @@ OH_AVErrCode OH_LowPowerAudioSink_SetPlaybackSpeed(OH_LowPowerAudioSink* sink, c */ OH_AVErrCode OH_LowPowerAudioSink_ReturnSamples(OH_LowPowerAudioSink* sink, OH_AVSamplesBuffer* samples); -/** - * @brief Set the loudness gain for lowpower audio sink. - * - * @param {OH_LowPowerAudioSink*} sink Pointer to an OH_LowPowerAudioSink instance. - * @param {float} loudnessGain Loudness gain to set which changes from -90.0 to 24.0, expressing in dB. - * The default loudness gain is 0.0dB. - * @return Returns AV_ERR_OK if the gain is set successfully; - * otherwise, returns a specific error code as defined in {@link OH_AVErrCode} - * {@link AV_ERR_INVALID_VAL} the sink is nullptr or loudnessGain is out of valid range. - * {@link AV_ERR_SERVICE_DIED} media service is died. - * @since 20 - */ -OH_AVErrCode OH_LowPowerAudioSink_SetLoudnessGain(OH_LowPowerAudioSink* sink, float loudnessGain); - /** * @brief Regsister callback instance for lowpower audio sink. * diff --git a/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json b/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json index 7e53713e491..079f642c5fb 100644 --- a/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json +++ b/multimedia/player_framework/lowpower_avsink/liblowpower_avsink.ndk.json @@ -67,10 +67,6 @@ "first_introduced": "20", "name": "OH_LowPowerAudioSink_ReturnSamples" }, - { - "first_introduced": "20", - "name": "OH_LowPowerAudioSink_SetLoudnessGain" - }, { "first_introduced": "20", "name": "OH_LowPowerAudioSink_RegisterCallback" -- Gitee From 1cf31e0a67bab5c6f723b44540f7cabecde50413 Mon Sep 17 00:00:00 2001 From: liujiaxing2024 Date: Tue, 19 Aug 2025 20:04:43 +0800 Subject: [PATCH 3/8] =?UTF-8?q?hiappevent=20API=2021=E5=9B=9E=E9=80=80res6?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liujiaxing2024 Change-Id: Iff6574c49f0d592d3d63d6f04e5389d4905697a6 --- .../hiappevent/include/hiappevent/hiappevent_event.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h b/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h index 83c319e6c04..06f186ed5ad 100644 --- a/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h +++ b/hiviewdfx/hiappevent/include/hiappevent/hiappevent_event.h @@ -168,14 +168,6 @@ extern "C" { */ #define EVENT_APP_KILLED "APP_KILLED" -/** - * @brief audio jank frame event. - * - * @since 21 - * @version 1.0 - */ -#define EVENT_AUDIO_JANK_FRAME "AUDIO_JANK_FRAME" - /** * @brief OS domain. * -- Gitee From 7709a9ef2411c722359b25f27f356b46dabe21d7 Mon Sep 17 00:00:00 2001 From: xushunjie Date: Sat, 23 Aug 2025 11:55:51 +0800 Subject: [PATCH 4/8] revert image capi Signed-off-by: xushunjie --- arkui/ace_engine/native/native_node.h | 108 -------------------------- arkui/ace_engine/native/native_type.h | 40 ---------- 2 files changed, 148 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 50ede589c7f..da039536207 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -2761,114 +2761,6 @@ typedef enum { * @since 20 */ NODE_IMAGE_SYNC_LOAD = 4012, - /** - * @brief Defines the image decoding size attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: width of the image decoding, in px.\n - * .value[1].i32: height of the image decoding, in px.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: width of the image decoding, in px.\n - * .value[1].i32: height of the image decoding, in px.\n - * - * @since 21 - */ - NODE_IMAGE_SOURCE_SIZE = 4013, - /** - * @brief Defines the display tranformation matrix for an image. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0...15].f32: 16 floating-point numbers.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0...15].f32: 16 floating-point numbers.\n - * - * @since 21 - */ - NODE_IMAGE_IMAGE_MATRIX = 4014, - /** - * @brief Defines the image follow text direction attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: whether to follows the text direction.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: whether to follows the text direction.\n - * - * @since 21 - */ - NODE_IMAGE_MATCH_TEXT_DIRECTION = 4015, - /** - * @brief Defines the image copy attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: copy option {@link ArkUI_CopyOptions}. The default value is ARKUI_COPY_OPTIONS_NONE.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: copy option {@link ArkUI_CopyOptions.\n - * - * @since 21 - */ - NODE_IMAGE_COPY_OPTION = 4016, - /** - * @brief Defines the image AI analysis enable attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: whether to enable AI analysis for the image.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: whether to enable AI analysis for the image.\n - * - * @since 21 - */ - NODE_IMAGE_ENABLE_ANALYZER = 4017, - /** - * @brief Defines the image dynamic display range attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: dynamic range mode {@link ArkUI_DynamicRangeMode}. - * The default value is ARKUI_DYNAMIC_RANGE_MODE_STANDARD.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: dynamic range mode {@link ArkUI_DynamicRangeMode.\n - * - * @since 21 - */ - NODE_IMAGE_DYNAMIC_RANGE_MODE = 4018, - /** - * @brief Defines the image dynamic display brightness attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].f32: hdr brightness. value range [0, 1]\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].f32: hdr brightness. value range [0, 1]\n - * - * @since 21 - */ - NODE_IMAGE_HDR_BRIGHTNESS = 4019, - /** - * @brief Defines the image display direction attribute. - * This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: orientation {@link ArkUI_Orientation}. - * The default value is ARKUI_ORIENTATION_UP.\n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: orientation {@link ArkUI_Orientation.\n - * - * @since 21 - */ - NODE_IMAGE_ORIENTATION = 4020, /** * @brief Defines the color of the component when it is selected. * This attribute can be set, reset, and obtained as required through APIs. diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 7cef398b2d6..3bfa0c36dc2 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -1374,46 +1374,6 @@ typedef enum { ARKUI_IMAGE_INTERPOLATION_HIGH, } ArkUI_ImageInterpolation; -/** - * @brief Enumerates the image dynamic range mode. - * - * @since 21 - */ -typedef enum { - /** high dynamic range mode. */ - ARKUI_DYNAMIC_RANGE_MODE_HIGH = 0, - /** constraint dynamic range mode. */ - ARKUI_DYNAMIC_RANGE_MODE_CONSTRAINT, - /** standard dynamic range mode. */ - ARKUI_DYNAMIC_RANGE_MODE_STANDARD, -} ArkUI_DynamicRangeMode; - -/** - * @brief Enumerates the image rotate orientation. - * - * @since 21 - */ -typedef enum { - /** Use EXIF metadata for display orientation, with support for rotation and mirroring. */ - ARKUI_ORIENTATION_AUTO = 0, - /** Display original pixel data without transformation. */ - ARKUI_ORIENTATION_UP, - /** Display the image after rotating it 90 degrees clockwise. */ - ARKUI_ORIENTATION_RIGHT, - /** Display the image after rotating it 180 degrees clockwise. */ - ARKUI_ORIENTATION_DOWN, - /** Display the image after rotating it 270 degrees clockwise. */ - ARKUI_ORIENTATION_LEFT, - /** Display the image after flipping it horizontally. */ - ARKUI_ORIENTATION_UP_MIRRORED, - /** Display the image after flipping it horizontally and then rotating it 90 degrees clockwise. */ - ARKUI_ORIENTATION_RIGHT_MIRRORED, - /** Display the image after flipping it vertically. */ - ARKUI_ORIENTATION_DOWN_MIRRORED, - /** Display the image after flipping it horizontally and then rotating it 270 degrees clockwise. */ - ARKUI_ORIENTATION_LEFT_MIRRORED, -} ArkUI_ImageRotateOrientation; - /** * @brief Enumerates the blend modes. * -- Gitee From f556118af152b38f9f5e351f3b6f5d8e681f695f Mon Sep 17 00:00:00 2001 From: wanglili12 Date: Sat, 23 Aug 2025 17:51:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanglili12 --- arkui/ace_engine/native/native_node.h | 98 ++++++++++++++------------- 1 file changed, 51 insertions(+), 47 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 50ede589c7f..3cefac3f1cb 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1807,8 +1807,8 @@ typedef enum { * */ NODE_VISIBLE_AREA_CHANGE_RATIO = 93, - - /** + + /** * @brief Sets the transition effect when the component is inserted or deleted. * This attribute can be set, and obtained as required through APIs. * @@ -1981,7 +1981,8 @@ typedef enum { NODE_TRANSLATE_WITH_PERCENT = 103, /** - * @brief Sets component rotation with multi-axis angle control. This attribute can be set, reset, and obtained as required through APIs. + * @brief Sets component rotation with multi-axis angle control. This attribute can be set, reset, + * and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n * .value[0].f32: x-axis rotation angle. The default value is 0. \n @@ -2445,7 +2446,8 @@ typedef enum { NODE_TEXT_LINEAR_GRADIENT = 1033, /** - * @brief Sets a radial gradient effect for text. This attribute can be set, reset, and obtained as required through APIs. + * @brief Sets a radial gradient effect for text. + * This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n * .value[0]?.f32: X-coordinate of the radial gradient center relative to the upper left corner of the text. \n @@ -3379,6 +3381,7 @@ typedef enum { * @since 15 */ NODE_TEXT_INPUT_LETTER_SPACING = 7032, + /** * @brief Sets whether to enable preview text for the TextInput component. * This attribute can be set, reset, and obtained as required through APIs. @@ -3430,17 +3433,17 @@ typedef enum { * * @since 20 */ - NODE_TEXT_INPUT_ENABLE_FILL_ANIMATION = 7036, - + NODE_TEXT_INPUT_ENABLE_FILL_ANIMATION = 7036, + /** * @brief Set the line height of the input node. * This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value. * \n * Format of the return value {@link ArkUI_AttributeItem}: \n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value * * @since 20 */ @@ -3729,6 +3732,7 @@ typedef enum { * */ NODE_TEXT_AREA_SHOW_KEYBOARD_ON_FOCUS, + /** * @brief When this property is set, the height of the textArea component is calculated using this property. * @@ -3795,13 +3799,13 @@ typedef enum { NODE_TEXT_AREA_KEYBOARD_APPEARANCE = 8026, /** - * @brief Set the max lines of the node. This attrilbute can be set, reset, and obtained as required through APIs. + * @brief Set the max lines of the node. This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: max lines count. \n + * .value[0].i32: max lines count. * \n * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: max lines count. \n + * .value[0].i32: max lines count.\n * * @since 20 */ @@ -3820,19 +3824,19 @@ typedef enum { */ NODE_TEXT_AREA_LINE_SPACING = 8028, - /** - * @brief Set the min lines of the node. This attribute can be set, reset, and obtained as required through APIs. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: min lines count. - * \n - * Format of the return value {@link ArkUI_AttributeItem}: \n - * .value[0].i32: min line count.\n - * - * @since 20 - * - */ - NODE_TEXT_AREA_MIN_LINES = 8029, + /** + * @brief Set the min lines of the node. This attribute can be set, reset, and obtained as required through APIs. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].i32: min lines count. + * \n + * Format of the return value {@link ArkUI_AttributeItem}: \n + * .value[0].i32: min line count.\n + * + * @since 20 + * + */ + NODE_TEXT_AREA_MIN_LINES = 8029, /** * @brief Set the max lines of the node with scroll. @@ -3846,16 +3850,16 @@ typedef enum { * * @since 20 */ - NODE_TEXT_AREA_MAX_LINES_WITH_SCROLL = 8030, + NODE_TEXT_AREA_MAX_LINES_WITH_SCROLL = 8030, /** * @brief Set the line height of the node. This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value. * \n * Format of the return value {@link ArkUI_AttributeItem}: \n - * .value[0].i32: line height value. \n + * .value[0].i32: line height value * * @since 20 */ @@ -4403,7 +4407,7 @@ typedef enum { * */ NODE_TIME_PICKER_SELECTED_TEXT_STYLE, - /** + /** * @brief Defines the start time of the time picker. * This attribute can be set, reset, and obtained as required through APIs. * @@ -6977,7 +6981,8 @@ typedef enum { /** * @brief Defines the gesture event type. * - * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is {@link ArkUI_UIInputEvent}. + * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is + * {@link ArkUI_UIInputEvent}. */ NODE_TOUCH_EVENT = 0, @@ -7335,11 +7340,11 @@ typedef enum { */ NODE_TEXT_ON_DETECT_RESULT_UPDATE = MAX_NODE_SCOPE_NUM * ARKUI_NODE_TEXT, /** - * @brief Defines the long press event for span + * @brief Defines the long press event for span. * * The event is triggered when the span is long pressed. * When the event callback occurs, the {@link ArkUI_NodeEvent} object can be obtained from the - * {@link ArkUI_UIInputEvent} object.\n + * {@link ArkUI_UIInputEvent} object. \n * @since 20 */ NODE_TEXT_SPAN_ON_LONG_PRESS = 1001, @@ -7587,7 +7592,7 @@ typedef enum { NODE_TEXT_INPUT_ON_CHANGE_WITH_PREVIEW_TEXT = 7013, /** - * @brief Defines the event triggered before content changes. + * @brief Defines the event triggered before content changes * * When the event callback occurs, the union type {@link ArkUI_NodeEvent} is {@link ArkUI_TextChangeEvent}. \n * {@link ArkUI_TextChangeEvent} contains the following parameters: \n @@ -7766,7 +7771,7 @@ typedef enum { NODE_TEXT_AREA_ON_CHANGE_WITH_PREVIEW_TEXT = 8012, /** - * @brief Defines the event triggered before content changes + * @brief Defines the event triggered before content changes. * * When the event callback occurs, the union type {@link ArkUI_NodeEvent} is {@link ArkUI_TextChangeEvent}. \n * {@link ArkUI_TextChangeEvent} contains the following parameters: \n @@ -9866,18 +9871,6 @@ float OH_ArkUI_SystemFontStyleEvent_GetFontSizeScale(const ArkUI_SystemFontStyle */ float OH_ArkUI_SystemFontStyleEvent_GetFontWeightScale(const ArkUI_SystemFontStyleEvent* event); -/** - * @brief Get the node handle by id. - * - * @param id The id of the target node handle. - * @param node The handle of target node handle. - * @return Error code. - * {@link ARKUI_ERROR_CODE_NO_ERROR} success. - * {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function parameter exception. - * @since 15 - */ -int32_t OH_ArkUI_NodeUtils_GetAttachedNodeHandleById(const char* id, ArkUI_NodeHandle* node); - /** * @brief Move the node handle to target parent node as child. * @@ -9931,7 +9924,6 @@ int32_t OH_ArkUI_NodeUtils_GetCrossLanguageOption(ArkUI_NodeHandle node, ArkUI_C int32_t OH_ArkUI_RegisterLayoutCallbackOnNodeHandle(ArkUI_NodeHandle node, void* userData, void (*onLayoutCompleted)(void* userData)); - /** * @brief Registers a callback for node when draw is completed. * @@ -9968,6 +9960,18 @@ int32_t OH_ArkUI_UnregisterLayoutCallbackOnNodeHandle(ArkUI_NodeHandle node); */ int32_t OH_ArkUI_UnregisterDrawCallbackOnNodeHandle(ArkUI_NodeHandle node); +/** + * @brief Get the node handle by id. + * + * @param id The id of the target node handle. + * @param node The handle of target node handle. + * @return Error code. + * {@link ARKUI_ERROR_CODE_NO_ERROR} success. + * {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function parameter exception. + * @since 15 + */ +int32_t OH_ArkUI_NodeUtils_GetAttachedNodeHandleById(const char* id, ArkUI_NodeHandle* node); + /** * @brief Get the snapshot pixelmap for the given node synchronously, will get error if the node is not on the * tree or is not rendered yet. @@ -10048,7 +10052,7 @@ ArkUI_ErrorCode OH_ArkUI_RemoveSupportedUIStates(ArkUI_NodeHandle node, int32_t /** * @brief Run a custom function inside the UIContext scope. * - * @param uiContext Indicates the pointer to a UI instance. + * @param uiContext ArkUI_ContextHandle. * @param userData Indicates the pointer to the custom data. * @param callback The custom function. * @return Returns the result code. -- Gitee From 3e030f7365985ba80be0f85ba2ce661a90faa78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E5=9B=BD=E5=86=9B?= Date: Tue, 26 Aug 2025 16:50:27 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=8B=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 任国军 --- AbilityKit/ability_runtime/application_context.h | 13 ------------- .../ability_runtime/libability_runtime.ndk.json | 4 ---- 2 files changed, 17 deletions(-) diff --git a/AbilityKit/ability_runtime/application_context.h b/AbilityKit/ability_runtime/application_context.h index 00c5d579d45..ed62cf40293 100644 --- a/AbilityKit/ability_runtime/application_context.h +++ b/AbilityKit/ability_runtime/application_context.h @@ -294,19 +294,6 @@ AbilityRuntime_ErrorCode OH_AbilityRuntime_StartSelfUIAbility(AbilityBase_Want * AbilityRuntime_ErrorCode OH_AbilityRuntime_StartSelfUIAbilityWithStartOptions(AbilityBase_Want *want, AbilityRuntime_StartOptions *options); - /** - * @brief Obtain the version code of the application. - * - * @param versionCode The version code of the application. - * @return The error code. - * {@link ABILITY_RUNTIME_ERROR_CODE_NO_ERROR} if the operation is successful. - * {@link ABILITY_RUNTIME_ERROR_CODE_PARAM_INVALID} if the versionCode is null. - * {@link ABILITY_RUNTIME_ERROR_CODE_CONTEXT_NOT_EXIST} if the application context does not exist. - * {@link ABILITY_RUNTIME_ERROR_CODE_GET_APPLICATION_INFO_FAILED} if the application info does not exist. - * @since 21 - */ -AbilityRuntime_ErrorCode OH_AbilityRuntime_ApplicationContextGetVersionCode(int64_t* versionCode); - #ifdef __cplusplus } // extern "C" #endif diff --git a/AbilityKit/ability_runtime/libability_runtime.ndk.json b/AbilityKit/ability_runtime/libability_runtime.ndk.json index f7939128e40..6790d7d683b 100644 --- a/AbilityKit/ability_runtime/libability_runtime.ndk.json +++ b/AbilityKit/ability_runtime/libability_runtime.ndk.json @@ -178,9 +178,5 @@ { "first_introduced": "20", "name": "OH_AbilityRuntime_ApplicationContextGetResourceDir" - }, - { - "first_introduced": "21", - "name": "OH_AbilityRuntime_ApplicationContextGetVersionCode" } ] \ No newline at end of file -- Gitee From 54fdab579606df87632ec1eac9f8f46cd7d46fe5 Mon Sep 17 00:00:00 2001 From: cheerful_ricky Date: Wed, 20 Aug 2025 14:32:13 +0800 Subject: [PATCH 7/8] fix history comments Signed-off-by: cheerful_ricky --- BasicServicesKit/commonevent/oh_commonevent.h | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/BasicServicesKit/commonevent/oh_commonevent.h b/BasicServicesKit/commonevent/oh_commonevent.h index d3f16a959a7..a5cca763b88 100644 --- a/BasicServicesKit/commonevent/oh_commonevent.h +++ b/BasicServicesKit/commonevent/oh_commonevent.h @@ -227,19 +227,19 @@ CommonEvent_ErrCode OH_CommonEvent_UnSubscribe(const CommonEvent_Subscriber* sub const char* OH_CommonEvent_GetEventFromRcvData(const CommonEvent_RcvData* rcvData); /** - * @brief Get event result code from callback data. + * @brief Get event code from callback data. * * @param rcvData Indicates the callback data. - * @return Returns the event of result code, default is 0. + * @return Returns the event of code, default is 0. * @since 12 */ int32_t OH_CommonEvent_GetCodeFromRcvData(const CommonEvent_RcvData* rcvData); /** - * @brief Get event result data from callback data. + * @brief Get event data from callback data. * * @param rcvData Indicates the callback data. - * @return Returns the event of result data, default is null. + * @return Returns the event of data, default is null. * @since 12 */ const char* OH_CommonEvent_GetDataStrFromRcvData(const CommonEvent_RcvData* rcvData); @@ -628,7 +628,7 @@ CommonEvent_ErrCode OH_CommonEvent_SetDoubleArrayToParameters(CommonEvent_Parame const double* value, size_t num); /** - * @brief Publish a standard commen event. + * @brief Publish a commen event. * * @param event Indicates the name of the common event. * @return Returns the error code. @@ -704,39 +704,39 @@ bool OH_CommonEvent_AbortCommonEvent(CommonEvent_Subscriber* subscriber); bool OH_CommonEvent_ClearAbortCommonEvent(CommonEvent_Subscriber* subscriber); /** - * @brief Get result code from an ordered event by a subscriber. + * @brief Get code from an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @return Returns the result code, default is 0. + * @return Returns the code, default is 0. * @since 18 */ int32_t OH_CommonEvent_GetCodeFromSubscriber(const CommonEvent_Subscriber* subscriber); /** - * @brief Set result code to an ordered event by a subscriber. + * @brief Set code to an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @param code Indicates the result code. + * @param code Indicates the code. * @return Returns the result of operation, true means succeeded. * @since 18 */ bool OH_CommonEvent_SetCodeToSubscriber(CommonEvent_Subscriber* subscriber, int32_t code); /** - * @brief Get result data from an ordered event by a subscriber. + * @brief Get data from an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @return Returns the result data, default is null. + * @return Returns the data, default is null. * @since 18 */ const char* OH_CommonEvent_GetDataFromSubscriber(const CommonEvent_Subscriber* subscriber); /** - * @brief Set result data to an ordered event by a subscriber. + * @brief Set data to an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @param data Indicates the result data. - * @param length Indicates the length of result data. + * @param data Indicates the data. + * @param length Indicates the length of data. * @return Returns the result of operation, true means succeeded. * @since 18 */ -- Gitee From 26f022c3b26e4246f4a4d7dca7b27b8850a0daea Mon Sep 17 00:00:00 2001 From: wangzhihao Date: Wed, 27 Aug 2025 19:47:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?api=E5=91=8A=E8=AD=A6=E8=A7=84=E8=8C=83?= =?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: wangzhihao --- arkui/ace_engine/native/drag_and_drop.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index 15f4de62140..692e033dcad 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -467,8 +467,9 @@ float OH_ArkUI_DragEvent_GetVelocity(ArkUI_DragEvent* event); * @brief Obtains the pressed status of modifier keys from a drag event. * * @param event Indicates the pointer to an ArkUI_DragEvent object. - * @param keys {@link ArkUI_ModifierKeyName} Indicates the returned combination of modifier keys that are currently pressed. - * The application can determine the pressed modifier keys through bitwise operations. + * @param keys {@link ArkUI_ModifierKeyName} Indicates the returned combination of modifier keys + * that are currently pressed. The application can determine the pressed modifier keys + * through bitwise operations. * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. @@ -968,7 +969,7 @@ int32_t OH_ArkUI_NotifyDragEndPendingDone(int32_t requestIdentify); * to pass a character array for receiving the string and explicitly specify the array length. It is * recommended that the array length be no less than 128 characters. If the length cannot accommodate * the actual bundle name length, the ERROR result will be returned. - * + * * @param event Indicates the pointer to an ArkUI_DragEvent object. * @param bundleName A string array used to receive the source application's bundle name. * @param length Use this to explicitly specify the length of the incoming string array. -- Gitee