From e19ba8757a11135427dcf46a8523a5cbf51744e6 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sun, 13 Jul 2025 19:22:34 +0800 Subject: [PATCH 1/2] =?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 --- .../emitter/ani/ets/@ohos.events.emitter.ets | 91 ++++++++++--------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets index 9ab3a71..209a7aa 100644 --- a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets +++ b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets @@ -79,30 +79,39 @@ namespace emitter { export native function EmitStringOptionsSync(eventId:string, options: Options): void; export function on(event: InnerEvent, callback: Callback): void { - if (event == null || callback == null) { - return; - } if (event.eventId) { OnOrOnceSync(event.eventId, false, callback, "eventData"); } } - export function once(event: InnerEvent, callback: Callback): void { - if (event == null || callback == null) { + 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 once(event: InnerEvent, callback: Callback): void { if (event.eventId) { OnOrOnceSync(event.eventId, true, callback, "eventData"); } } export function once(eventId: string, callback: Callback): void { - if (eventId === '' || callback == null) { + if (eventId === '') { return; } OnOrOnceStringSync(eventId, true, callback, "eventData"); } + export function off(eventId: number): void { + OffNumberSync(eventId); + } + export function off(eventId: string): void { if (eventId === '') { return; @@ -110,21 +119,6 @@ namespace emitter { OffStringIdSync(eventId); } - export function off(eventId: string, callback: Callback | Callback>): void { - if (eventId === '' || callback == null) { - return; - } - if (callback instanceof Callback) { - OffStringSync(eventId, callback as Callback); - } else { - OffGenericEventSync(eventId, callback as Callback>); - } - } - - export function off(eventId: number): void { - OffNumberSync(eventId); - } - export function off(eventId: number, callback: Callback): void { if (callback == null) { return; @@ -132,69 +126,82 @@ namespace emitter { OffNumberCallbackSync(eventId, callback); } - export function on(eventId: string, callback: Callback | Callback>): void { - if (eventId === '' || callback == null) { + export function off(eventId: string, callback: Callback | Callback>): void { + if (eventId === '') { return; } if (callback instanceof Callback) { - OnOrOnceStringSync(eventId, false, callback as Callback, "eventData"); + OffStringSync(eventId, callback as Callback); } else { - OnOrOnceGenericEventSync(eventId, false, callback as Callback>, "genericEventData"); + OffGenericEventSync(eventId, callback as Callback>); } } - export function emit(eventId: string, options: Options, data?: EventData): void { - if (eventId === '' || options == null) { +export function emit(event: InnerEvent, data?: EventData): void { + if (event == null) { return; } if (data != undefined) { - EmitStringOptionsDataSync(eventId, options, data as EventData); + EmitInnerEventDataSync(event, data); } else { - EmitStringOptionsSync(eventId, options); + EmitInnerEventSync(event); } } - export function emit(eventId: string, options: Options, data?: GenericEventData): void { - if (eventId === '' || options == null) { + export function emit(eventId: string, data?: EventData): void { + if (eventId === '') { return; } if (data != undefined) { - EmitStringOptionsGenericSync(eventId, options, data as GenericEventData); + EmitStringDataSync(eventId, data as EventData); } else { - EmitStringOptionsSync(eventId, options); + EmitStringSync(eventId); } } - export function emit(eventId: string, data?: EventData): void { + export function emit(eventId: string, data?: GenericEventData): void { if (eventId === '') { return; } if (data != undefined) { - EmitStringDataSync(eventId, data as EventData); + EmitStringGenericSync(eventId, data as GenericEventData); } else { EmitStringSync(eventId); } } - export function emit(eventId: string, data?: GenericEventData): void { + export function on(eventId: string, callback: Callback): void { + if (eventId === '') { + return; + } + 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, 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 From 6ab26871eed16a9b200a1b226e498687d847cdaa Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sun, 13 Jul 2025 19:53:53 +0800 Subject: [PATCH 2/2] modify Signed-off-by: Michael Wang --- frameworks/emitter/ani/ets/@ohos.events.emitter.ets | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets index 209a7aa..f04da08 100644 --- a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets +++ b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets @@ -170,19 +170,6 @@ export function emit(event: InnerEvent, data?: EventData): void { } } - export function on(eventId: string, callback: Callback): void { - if (eventId === '') { - return; - } - 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, options: Options, data?: EventData): void { if (eventId === '') { return; -- Gitee