From 3b57193afeea912e185c051c0acb42f49bb74da6 Mon Sep 17 00:00:00 2001 From: Vyacheslav Cherkashin Date: Wed, 2 Jul 2025 12:24:31 +0300 Subject: [PATCH] Remove deprecated Tuple ANI APIs Issue: #ICJII7 Signed-off-by: Vyacheslav Cherkashin Change-Id: I4a3bf5e3c4e0831c113834e8ceb121f4b2e3e139 --- .../koala_mirror/interop/src/cpp/ani/ani.h | 331 ------------------ .../ani/promptaction/src/dialog_params.cpp | 12 +- 2 files changed, 3 insertions(+), 340 deletions(-) diff --git a/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/ani.h b/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/ani.h index a171d16adb1..554266860e1 100644 --- a/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/ani.h +++ b/frameworks/bridge/arkts_frontend/koala_mirror/interop/src/cpp/ani/ani.h @@ -65,7 +65,6 @@ class __ani_object : public __ani_ref {}; class __ani_fn_object : public __ani_object {}; class __ani_enum_item : public __ani_object {}; class __ani_error : public __ani_object {}; -class __ani_tuple_value : public __ani_object {}; class __ani_type : public __ani_object {}; class __ani_arraybuffer : public __ani_object {}; class __ani_string : public __ani_object {}; @@ -98,7 +97,6 @@ typedef __ani_object *ani_object; typedef __ani_fn_object *ani_fn_object; typedef __ani_enum_item *ani_enum_item; typedef __ani_error *ani_error; -typedef __ani_tuple_value *ani_tuple_value; typedef __ani_type *ani_type; typedef __ani_arraybuffer *ani_arraybuffer; typedef __ani_string *ani_string; @@ -133,7 +131,6 @@ typedef ani_ref ani_object; typedef ani_object ani_fn_object; typedef ani_object ani_enum_item; typedef ani_object ani_error; -typedef ani_object ani_tuple_value; typedef ani_object ani_type; typedef ani_object ani_arraybuffer; typedef ani_object ani_string; @@ -5716,258 +5713,6 @@ struct __ani_interaction_api { ani_status (*Object_CallMethodByName_Void_V)(ani_env *env, ani_object object, const char *name, const char *signature, va_list args); - /** - * @brief Retrieves the number of items in a tuple value. - * - * This function retrieves the total number of items in the specified tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value whose number of items is to be retrieved. - * @param[out] result A pointer to store the number of items. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetNumberOfItems)(ani_env *env, ani_tuple_value tuple_value, ani_size *result); - - /** - * @brief Retrieves a boolean item from a tuple value. - * - * This function retrieves the boolean value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the boolean value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Boolean)(ani_env *env, ani_tuple_value tuple_value, ani_size index, - ani_boolean *result); - - /** - * @brief Retrieves a char item from a tuple value. - * - * This function retrieves the char value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the char value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Char)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_char *result); - - /** - * @brief Retrieves a byte item from a tuple value. - * - * This function retrieves the byte value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the byte value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Byte)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_byte *result); - - /** - * @brief Retrieves a short item from a tuple value. - * - * This function retrieves the short value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the short value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Short)(ani_env *env, ani_tuple_value tuple_value, ani_size index, - ani_short *result); - - /** - * @brief Retrieves a integer item from a tuple value. - * - * This function retrieves the integer value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the integer value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Int)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_int *result); - - /** - * @brief Retrieves a long item from a tuple value. - * - * This function retrieves the long value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the long value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Long)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_long *result); - - /** - * @brief Retrieves a float item from a tuple value. - * - * This function retrieves the float value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the float value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Float)(ani_env *env, ani_tuple_value tuple_value, ani_size index, - ani_float *result); - - /** - * @brief Retrieves a double item from a tuple value. - * - * This function retrieves the double value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the double value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Double)(ani_env *env, ani_tuple_value tuple_value, ani_size index, - ani_double *result); - - /** - * @brief Retrieves a reference item from a tuple value. - * - * This function retrieves the reference value of the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[out] result A pointer to store the reference value of the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_GetItem_Ref)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_ref *result); - - /** - * @brief Sets a boolean value to an item in a tuple value. - * - * This function assigns a boolean value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The boolean value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Boolean)(ani_env *env, ani_tuple_value tuple_value, ani_size index, - ani_boolean value); - - /** - * @brief Sets a char value to an item in a tuple value. - * - * This function assigns a char value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The char value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Char)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_char value); - - /** - * @brief Sets a byte value to an item in a tuple value. - * - * This function assigns a byte value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The byte value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Byte)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_byte value); - - /** - * @brief Sets a short value to an item in a tuple value. - * - * This function assigns a short value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The short value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Short)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_short value); - - /** - * @brief Sets a integer value to an item in a tuple value. - * - * This function assigns a integer value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The integer value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Int)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_int value); - - /** - * @brief Sets a long value to an item in a tuple value. - * - * This function assigns a long value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The long value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Long)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_long value); - - /** - * @brief Sets a float value to an item in a tuple value. - * - * This function assigns a float value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The float value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Float)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_float value); - - /** - * @brief Sets a double value to an item in a tuple value. - * - * This function assigns a double value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The double value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Double)(ani_env *env, ani_tuple_value tuple_value, ani_size index, - ani_double value); - - /** - * @brief Sets a reference value to an item in a tuple value. - * - * This function assigns a reference value to the item at the specified index in the tuple value. - * - * @param[in] env A pointer to the environment structure. - * @param[in] tuple_value The tuple value containing the item. - * @param[in] index The index of the item. - * @param[in] value The reference value to assign to the item. - * @return Returns a status code of type `ani_status` indicating success or failure. - */ - ani_status (*TupleValue_SetItem_Ref)(ani_env *env, ani_tuple_value tuple_value, ani_size index, ani_ref value); - /** * @brief Creates a global reference. * @@ -7985,82 +7730,6 @@ struct __ani_env { { return c_api->Object_CallMethodByName_Void_V(this, object, name, signature, args); } - ani_status TupleValue_GetNumberOfItems(ani_tuple_value tuple_value, ani_size *result) - { - return c_api->TupleValue_GetNumberOfItems(this, tuple_value, result); - } - ani_status TupleValue_GetItem_Boolean(ani_tuple_value tuple_value, ani_size index, ani_boolean *result) - { - return c_api->TupleValue_GetItem_Boolean(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Char(ani_tuple_value tuple_value, ani_size index, ani_char *result) - { - return c_api->TupleValue_GetItem_Char(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Byte(ani_tuple_value tuple_value, ani_size index, ani_byte *result) - { - return c_api->TupleValue_GetItem_Byte(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Short(ani_tuple_value tuple_value, ani_size index, ani_short *result) - { - return c_api->TupleValue_GetItem_Short(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Int(ani_tuple_value tuple_value, ani_size index, ani_int *result) - { - return c_api->TupleValue_GetItem_Int(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Long(ani_tuple_value tuple_value, ani_size index, ani_long *result) - { - return c_api->TupleValue_GetItem_Long(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Float(ani_tuple_value tuple_value, ani_size index, ani_float *result) - { - return c_api->TupleValue_GetItem_Float(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Double(ani_tuple_value tuple_value, ani_size index, ani_double *result) - { - return c_api->TupleValue_GetItem_Double(this, tuple_value, index, result); - } - ani_status TupleValue_GetItem_Ref(ani_tuple_value tuple_value, ani_size index, ani_ref *result) - { - return c_api->TupleValue_GetItem_Ref(this, tuple_value, index, result); - } - ani_status TupleValue_SetItem_Boolean(ani_tuple_value tuple_value, ani_size index, ani_boolean value) - { - return c_api->TupleValue_SetItem_Boolean(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Char(ani_tuple_value tuple_value, ani_size index, ani_char value) - { - return c_api->TupleValue_SetItem_Char(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Byte(ani_tuple_value tuple_value, ani_size index, ani_byte value) - { - return c_api->TupleValue_SetItem_Byte(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Short(ani_tuple_value tuple_value, ani_size index, ani_short value) - { - return c_api->TupleValue_SetItem_Short(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Int(ani_tuple_value tuple_value, ani_size index, ani_int value) - { - return c_api->TupleValue_SetItem_Int(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Long(ani_tuple_value tuple_value, ani_size index, ani_long value) - { - return c_api->TupleValue_SetItem_Long(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Float(ani_tuple_value tuple_value, ani_size index, ani_float value) - { - return c_api->TupleValue_SetItem_Float(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Double(ani_tuple_value tuple_value, ani_size index, ani_double value) - { - return c_api->TupleValue_SetItem_Double(this, tuple_value, index, value); - } - ani_status TupleValue_SetItem_Ref(ani_tuple_value tuple_value, ani_size index, ani_ref value) - { - return c_api->TupleValue_SetItem_Ref(this, tuple_value, index, value); - } ani_status GlobalReference_Create(ani_ref ref, ani_ref *result) { return c_api->GlobalReference_Create(this, ref, result); diff --git a/interfaces/ets/ani/promptaction/src/dialog_params.cpp b/interfaces/ets/ani/promptaction/src/dialog_params.cpp index 53512d3f079..9ec995e963c 100644 --- a/interfaces/ets/ani/promptaction/src/dialog_params.cpp +++ b/interfaces/ets/ani/promptaction/src/dialog_params.cpp @@ -463,19 +463,13 @@ bool GetActionMenuButtons(ani_env *env, ani_object object, std::vector(resultRef); - status = env->TupleValue_GetNumberOfItems(resultObj, &length); - if (status != ANI_OK) { - return false; - } - + const size_t maxTupleLength = 6; std::vector buttonArray; - for (int i = 0; i < int(length); i++) { + for (size_t i = 0; i < maxTupleLength; ++i) { ani_ref itemRef; status = env->Object_GetFieldByName_Ref(resultObj, ("$" + std::to_string(i)).c_str(), &itemRef); if (status != ANI_OK) { - continue; + break; } OHOS::Ace::ButtonInfo button; -- Gitee