From cb8ad0d0b483ded9f918a764e846779046c915f4 Mon Sep 17 00:00:00 2001 From: dujingcheng Date: Thu, 29 Aug 2024 14:02:35 +0000 Subject: [PATCH] dd Signed-off-by: dujingcheng --- arkui/ace_engine/native/libace.ndk.json | 24 ++++----- .../native/native_interface_accessibility.h | 52 +++++++++---------- 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 94884c361..108067435 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -2147,14 +2147,6 @@ "first_introduced": "13", "name": "OH_ArkUI_AddAndGetAccessibilityElementInfo" }, - { - "first_introduced": "13", - "name": "OH_ArkUI_SetAccessibilityElementInfoPageId" - }, - { - "first_introduced": "13", - "name": "OH_ArkUI_SetAccessibilityElementInfoComponentId" - }, { "first_introduced": "13", "name": "OH_ArkUI_SetAccessibilityElementInfoParentId" @@ -2331,10 +2323,6 @@ "first_introduced": "13", "name": "OH_ArkUI_SetAccessibilityEventEventType" }, - { - "first_introduced": "13", - "name": "OH_ArkUI_SetAccessibilityEventPageId" - }, { "first_introduced": "13", "name": "OH_ArkUI_SetAccessibilityEventTextAnnouncedForAccessibility" @@ -2351,8 +2339,20 @@ "first_introduced": "13", "name": "OH_ArkUI_FindAccessibilityActionArgumentByKey" }, + { + "first_introduced": "13", + "name": "OH_ArkUI_CreateAccessibilityElementInfo" + }, + { + "first_introduced": "13", + "name": "OH_ArkUI_DestoryAccessibilityElementInfo" + }, { "first_introduced": "13", "name": "OH_NativeXComponent_GetNativeAccessibilityProvider" + }, + { + "first_introduced": "13", + "name": "OH_ArkUI_SetAccessibilityElementInfoElementId" } ] \ No newline at end of file diff --git a/arkui/ace_engine/native/native_interface_accessibility.h b/arkui/ace_engine/native/native_interface_accessibility.h index 0fc10b641..3c0aafba1 100644 --- a/arkui/ace_engine/native/native_interface_accessibility.h +++ b/arkui/ace_engine/native/native_interface_accessibility.h @@ -17,7 +17,7 @@ * @addtogroup ArkUI_AccessibilityProvider * @{ * - * @brief + * @brief * * @since 13 * @version 1.0 @@ -26,7 +26,7 @@ /** * @file native_interface_accessibility.h * - * @brief + * @brief * * @since 13 * @version 1.0 @@ -361,26 +361,15 @@ void OH_ArkUI_SendAccessibilityAsyncEvent( ArkUI_AccessibilityElementInfo* OH_ArkUI_AddAndGetAccessibilityElementInfo(ArkUI_AccessibilityElementInfoList* list); /** -* @brief Sets the page id of the accessibility element information. +* @brief Sets the element id of the accessibility element information. * * @param elementInfo Indicates the pointer to the accessibility element information. -* @param pageId Indicates the page id. +* @param elementId Indicates the page id. * @return Returns {@link OH_ARKUI_ACCESSIBILITY_RESULT_SUCCESS} if success. * Returns {@link OH_ARKUI_ACCESSIBILITY_RESULT_BAD_PARAMETER} if a parameter exception occurs. * @since 13 */ -int32_t OH_ArkUI_SetAccessibilityElementInfoPageId(ArkUI_AccessibilityElementInfo* elementInfo, int32_t pageId); - -/** -* @brief Sets the page id of the accessibility element information. -* -* @param elementInfo Indicates the pointer to the accessibility element information. -* @param componentId Indicates the component id. -* @return Returns {@link OH_ARKUI_ACCESSIBILITY_RESULT_SUCCESS} if success. -* Returns {@link OH_ARKUI_ACCESSIBILITY_RESULT_BAD_PARAMETER} if a parameter exception occurs. -* @since 13 -*/ -int32_t OH_ArkUI_SetAccessibilityElementInfoComponentId(ArkUI_AccessibilityElementInfo* elementInfo, int32_t componentId); +int32_t OH_ArkUI_SetAccessibilityElementInfoElementId(ArkUI_AccessibilityElementInfo* elementInfo, int32_t elementId); /** * @brief Sets the parent id of the accessibility element information. @@ -833,6 +822,24 @@ int32_t OH_ArkUI_SetAccessibilityElementInfoBlur(ArkUI_AccessibilityElementInfo* */ int32_t OH_ArkUI_SetAccessibilityElementInfoHitTestBehavior(ArkUI_AccessibilityElementInfo* elementInfo, const char* hitTestBehavior); +/** + * @brief Create an accessibility elementInfo. + * + * @return Returns the pointer to the accessibility elementInfo. + * @since 13 + * @version 1.0 + */ +ArkUI_AccessibilityElementInfo* OH_ArkUI_CreateAccessibilityElementInfo(void); + +/** + * @brief Destorys an accessibility elementInfo. + * + * @param elementInfo Indicates the pointer to to the accessibility elementInfo info to be destoryed. + * @since 13 + * @version 1.0 + */ +void OH_ArkUI_DestoryAccessibilityElementInfo(ArkUI_AccessibilityElementInfo* elementInfo); + /** * @brief Create an accessibility eventInfo. * @@ -862,17 +869,6 @@ void OH_ArkUI_DestoryAccessibilityEventInfo(ArkUI_AccessibilityEventInfo* eventI */ int32_t OH_ArkUI_SetAccessibilityEventEventType(ArkUI_AccessibilityEventInfo* eventInfo, ArkUI_AccessibilityEventType eventType); -/** -* @brief Sets the pageId of the accessibility event information. -* -* @param eventInfo Indicates the pointer to the accessibility event information. -* @param pageId Indicates page id. -* @return Returns {@link OH_ARKUI_ACCESSIBILITY_RESULT_SUCCESS} if success. -* Returns {@link OH_ARKUI_ACCESSIBILITY_RESULT_BAD_PARAMETER} if a parameter exception occurs. -* @since 13 -*/ -int32_t OH_ArkUI_SetAccessibilityEventPageId(ArkUI_AccessibilityEventInfo* eventInfo, int32_t pageId); - /** * @brief Sets the textAnnouncedForAccessibility of the accessibility event information. * @@ -916,7 +912,7 @@ int32_t OH_ArkUI_SetAccessibilityEventElementInfo(ArkUI_AccessibilityEventInfo* * Returns {@link OH_ARKUI_ACCESSIBILITY_RESULT_BAD_PARAMETER} if a parameter exception occurs. * @since 13 */ -int32_t OH_ArkUI_FindAccessibilityActionArgumentByKey(ArkUI_AccessibilityActionArguments* arguments, const char* key, char* value); +int32_t OH_ArkUI_FindAccessibilityActionArgumentByKey(ArkUI_AccessibilityActionArguments* arguments, const char* key, char** value); #ifdef __cplusplus }; #endif