From 18e72aeaf64c80fbc62c51a46f4db127f5f6bb51 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sun, 13 Jul 2025 17:42:40 +0800 Subject: [PATCH] =?UTF-8?q?ANI=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Wang --- bundle.json | 4 +- .../emitter/ani/ets/@ohos.events.emitter.ets | 87 +++++++++---------- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/bundle.json b/bundle.json index ecc2df3..5065b2d 100644 --- a/bundle.json +++ b/bundle.json @@ -40,9 +40,9 @@ ], "fwk_group": [ "//base/notification/eventhandler/frameworks/eventhandler:libeventhandler", - "//base/notification/eventhandler/frameworks:emitter_packages", "//base/notification/eventhandler/frameworks:eventhandler_native_target", - "//base/notification/eventhandler/frameworks:napi_packages" + "//base/notification/eventhandler/frameworks:napi_packages", + "//base/notification/eventhandler/frameworks:emitter_packages" ], "service_group": [ diff --git a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets index 46dc9a5..209a7aa 100644 --- a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets +++ b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets @@ -84,17 +84,21 @@ namespace emitter { } } - export function once(event: InnerEvent, callback: Callback): void { - if (event.eventId) { - OnOrOnceSync(event.eventId, true, callback, "eventData"); + export function on(eventId: string, callback: Callback | Callback>): void { + if (eventId === '') { + return; + } + if (callback instanceof Callback) { + OnOrOnceStringSync(eventId, false, callback as Callback, "eventData"); + } else { + OnOrOnceGenericEventSync(eventId, false, callback as Callback>, "genericEventData"); } } - export function on(eventId: string, callback: Callback): void { - if (eventId === '') { - return; + export function once(event: InnerEvent, callback: Callback): void { + if (event.eventId) { + OnOrOnceSync(event.eventId, true, callback, "eventData"); } - emitter.OnOrOnceStringSync(eventId, false, callback, "eventData"); } export function once(eventId: string, callback: Callback): void { @@ -104,6 +108,10 @@ namespace emitter { OnOrOnceStringSync(eventId, true, callback, "eventData"); } + export function off(eventId: number): void { + OffNumberSync(eventId); + } + export function off(eventId: string): void { if (eventId === '') { return; @@ -111,11 +119,11 @@ namespace emitter { OffStringIdSync(eventId); } - export function off(eventId: string, callback: Callback): void { - if (eventId === '') { + export function off(eventId: number, callback: Callback): void { + if (callback == null) { return; } - emitter.OffStringSync(eventId, callback); + OffNumberCallbackSync(eventId, callback); } export function off(eventId: string, callback: Callback | Callback>): void { @@ -129,80 +137,71 @@ namespace emitter { } } - export function off(eventId: number): void { - OffNumberSync(eventId); - } - - export function off(eventId: number, callback: Callback): void { - if (callback == null) { - return; - } - OffNumberCallbackSync(eventId, callback); - } - - export function on(eventId: string, callback: Callback | Callback>): void { - if (eventId === '') { +export function emit(event: InnerEvent, data?: EventData): void { + if (event == null) { return; } - if (callback instanceof Callback) { - OnOrOnceStringSync(eventId, false, callback as Callback, "eventData"); + if (data != undefined) { + EmitInnerEventDataSync(event, data); } else { - OnOrOnceGenericEventSync(eventId, false, callback as Callback>, "genericEventData"); + EmitInnerEventSync(event); } } - export function emit(eventId: string, options: Options, data?: EventData): void { + export function emit(eventId: string, data?: EventData): void { if (eventId === '') { return; } if (data != undefined) { - EmitStringOptionsDataSync(eventId, options, data as EventData); + EmitStringDataSync(eventId, data as EventData); } else { - EmitStringOptionsSync(eventId, options); + EmitStringSync(eventId); } } - export function emit(eventId: string, options: Options, data?: GenericEventData): void { + export function emit(eventId: string, data?: GenericEventData): void { if (eventId === '') { return; } if (data != undefined) { - EmitStringOptionsGenericSync(eventId, options, data as GenericEventData); + EmitStringGenericSync(eventId, data as GenericEventData); } else { - EmitStringOptionsSync(eventId, options); + EmitStringSync(eventId); } } - export function emit(eventId: string, data?: EventData): void { + export function on(eventId: string, callback: Callback): void { if (eventId === '') { return; } - if (data != undefined) { - EmitStringDataSync(eventId, data as EventData); - } else { - EmitStringSync(eventId); + emitter.OnOrOnceStringSync(eventId, false, callback, "eventData"); + } + export function off(eventId: string, callback: Callback): void { + if (eventId === '') { + return; } + emitter.OffStringSync(eventId, callback); } - export function emit(eventId: string, data?: GenericEventData): void { + export function emit(eventId: string, options: Options, data?: EventData): void { if (eventId === '') { return; } if (data != undefined) { - EmitStringGenericSync(eventId, data as GenericEventData); + EmitStringOptionsDataSync(eventId, options, data as EventData); } else { - EmitStringSync(eventId); + EmitStringOptionsSync(eventId, options); } } - export function emit(event: InnerEvent, data?: EventData): void { - if (event == null) { + export function emit(eventId: string, options: Options, data?: GenericEventData): void { + if (eventId === '') { return; } if (data != undefined) { - EmitInnerEventDataSync(event, data); + EmitStringOptionsGenericSync(eventId, options, data as GenericEventData); } else { - EmitInnerEventSync(event); + EmitStringOptionsSync(eventId, options); } } -- Gitee