From 18a7294cc8c6acac61c6b2173adee6eb933898c4 Mon Sep 17 00:00:00 2001 From: Redkin Mikhail Date: Thu, 7 Aug 2025 15:39:34 +0300 Subject: [PATCH] Fix ani signatures 2 Signed-off-by: Redkin Mikhail Change-Id: Ic3e8f29496691231ee7ee12a98fe1f9e4038f364 --- frameworks/emitter/ani/src/ani_emitter.cpp | 27 ++++++++++--------- .../base/src/ani_async_callback_manager.cpp | 6 ++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/frameworks/emitter/ani/src/ani_emitter.cpp b/frameworks/emitter/ani/src/ani_emitter.cpp index a51c74f..a615b10 100644 --- a/frameworks/emitter/ani/src/ani_emitter.cpp +++ b/frameworks/emitter/ani/src/ani_emitter.cpp @@ -334,34 +334,35 @@ ani_status init(ani_env *env, ani_namespace kitNs) ani_native_function{"OnOrOnceSync", nullptr, reinterpret_cast(OnOrOnceSync)}, ani_native_function{"OnOrOnceStringSync", nullptr, reinterpret_cast(OnOrOnceStringSync)}, ani_native_function{"OnOrOnceGenericEventSync", nullptr, reinterpret_cast(OnOrOnceGenericEventSync)}, - ani_native_function{"OffStringIdSync", "Lstd/core/String;:V", reinterpret_cast(OffStringIdSync)}, + ani_native_function{"OffStringIdSync", "C{std.core.String}:", reinterpret_cast(OffStringIdSync)}, ani_native_function{"OffStringSync", nullptr, reinterpret_cast(OffStringSync)}, ani_native_function{"OffGenericEventSync", nullptr, reinterpret_cast(OffGenericEventSync)}, - ani_native_function{"OffNumberSync", "J:V", reinterpret_cast(OffNumberSync)}, + ani_native_function{"OffNumberSync", "l:", reinterpret_cast(OffNumberSync)}, ani_native_function{"OffNumberCallbackSync", nullptr, reinterpret_cast(OffNumberCallbackSync)}, - ani_native_function{"getListenerCountSync", "J:J", reinterpret_cast(getListenerCountNumber)}, + ani_native_function{"getListenerCountSync", "l:l", reinterpret_cast(getListenerCountNumber)}, ani_native_function{"getListenerCountStringSync", - "Lstd/core/String;:J", reinterpret_cast(getListenerCountString)}, - ani_native_function{"EmitInnerEventSync", "L@ohos/events/emitter/emitter/InnerEvent;:V", + "C{std.core.String}:l", reinterpret_cast(getListenerCountString)}, + ani_native_function{"EmitInnerEventSync", "C{@ohos.events.emitter.emitter.InnerEvent}:", reinterpret_cast(EmitInnerEventSync)}, ani_native_function{"EmitInnerEventDataSync", - "L@ohos/events/emitter/emitter/InnerEvent;L@ohos/events/emitter/emitter/EventData;:V", + "C{@ohos.events.emitter.emitter.InnerEvent}C{@ohos.events.emitter.emitter.EventData}:", reinterpret_cast(EmitInnerEventDataSync)}, - ani_native_function{"EmitStringSync", "Lstd/core/String;:V", reinterpret_cast(EmitStringSync)}, + ani_native_function{"EmitStringSync", "C{std.core.String}:", reinterpret_cast(EmitStringSync)}, ani_native_function{"EmitStringDataSync", - "Lstd/core/String;L@ohos/events/emitter/emitter/EventData;:V", + "C{std.core.String}C{@ohos.events.emitter.emitter.EventData}:", reinterpret_cast(EmitStringDataSync)}, ani_native_function{"EmitStringGenericSync", - "Lstd/core/String;L@ohos/events/emitter/emitter/GenericEventData;:V", + "C{std.core.String}C{@ohos.events.emitter.emitter.GenericEventData}:", reinterpret_cast(EmitStringGenericSync)}, ani_native_function{"EmitStringOptionsSync", - "Lstd/core/String;L@ohos/events/emitter/emitter/Options;:V", + "C{std.core.String}C{@ohos.events.emitter.emitter.Options}:", reinterpret_cast(EmitStringOptionsSync)}, ani_native_function{"EmitStringOptionsGenericSync", - "Lstd/core/String;L@ohos/events/emitter/emitter/Options;L@ohos/events/emitter/emitter/GenericEventData;:V", + "C{std.core.String}C{@ohos.events.emitter.emitter.Options}" + "C{@ohos.events.emitter.emitter.GenericEventData}:", reinterpret_cast(EmitStringOptionsGenericSync)}, ani_native_function{"EmitStringOptionsDataSync", - "Lstd/core/String;L@ohos/events/emitter/emitter/Options;L@ohos/events/emitter/emitter/EventData;:V", + "C{std.core.String}C{@ohos.events.emitter.emitter.Options}C{@ohos.events.emitter.emitter.EventData}:", reinterpret_cast(EmitStringOptionsDataSync)}, }; AgentInit(); @@ -381,7 +382,7 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) } ani_namespace kitNs; - status = env->FindNamespace("L@ohos/events/emitter/emitter;", &kitNs); + status = env->FindNamespace("@ohos.events.emitter.emitter", &kitNs); if (status != ANI_OK) { HILOGE("Not found ani_namespace L@ohos/events/emitter/emitter"); return status; diff --git a/frameworks/emitter/base/src/ani_async_callback_manager.cpp b/frameworks/emitter/base/src/ani_async_callback_manager.cpp index d484505..e2442ab 100644 --- a/frameworks/emitter/base/src/ani_async_callback_manager.cpp +++ b/frameworks/emitter/base/src/ani_async_callback_manager.cpp @@ -62,9 +62,9 @@ ani_status AniAsyncCallbackInfo::GetCallbackArgs( ani_status status = ANI_OK; ani_class cls; if (dataType == EVENT_DATA) { - status = env->FindClass("L@ohos/events/emitter/emitter/EventDataInner;", &cls); + status = env->FindClass("@ohos.events.emitter.emitter.EventDataInner", &cls); } else if (dataType == GENERIC_EVENT_DATA) { - status = env->FindClass("L@ohos/events/emitter/emitter/GenericEventDataInner;", &cls); + status = env->FindClass("@ohos.events.emitter.emitter.GenericEventDataInner", &cls); } else { return status; } @@ -73,7 +73,7 @@ ani_status AniAsyncCallbackInfo::GetCallbackArgs( return status; } ani_method ctor; - status = env->Class_FindMethod(cls, "", ":V", &ctor); + status = env->Class_FindMethod(cls, "", ":", &ctor); if (status != ANI_OK) { HILOGE("threadFunciton Class_FindMethod error%{public}d", status); return status; -- Gitee