diff --git a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets index afc1f10b11ff4435cd26602f690fae55adf8c5ab..5b0b0b26ef644a1d503e003a0c5461b61189c98f 100644 --- a/frameworks/emitter/ani/ets/@ohos.events.emitter.ets +++ b/frameworks/emitter/ani/ets/@ohos.events.emitter.ets @@ -78,7 +78,7 @@ namespace emitter { export native function EmitStringOptionsGenericSync(eventId: string, options: Options, data: GenericEventData): void; export native function EmitStringOptionsSync(eventId:string, options: Options): void; - export function on(event: InnerEvent, callback: Callback): void { + export function onWithEventTypeInnerEventCallback(event: InnerEvent, callback: Callback): void { if (event == null || callback == null) { return; } @@ -87,18 +87,21 @@ namespace emitter { } } - export function on(eventId: string, callback: Callback | Callback>): void { + export function onWithEventIdTypeStringCallback(eventId: string, callback: Callback): void { if (eventId === '' || callback == null) { return; } - if (callback instanceof Callback) { - OnOrOnceStringSync(eventId, false, callback as Callback, "eventData"); - } else { - OnOrOnceGenericEventSync(eventId, false, callback as Callback>, "genericEventData"); + OnOrOnceStringSync(eventId, false, callback, "eventData"); + } + + export function onWithEventIdTypeStringCallbackTypeGenericEventData(eventId: string, callback: Callback>): void { + if (eventId === '' || callback == null) { + return; } + OnOrOnceGenericEventSync(eventId, false, callback, "genericEventData"); } - export function once(event: InnerEvent, callback: Callback): void { + export function onceWithEventTypeInnerEventCallback(event: InnerEvent, callback: Callback): void { if (event == null || callback == null) { return; } @@ -107,40 +110,50 @@ namespace emitter { } } - export function once(eventId: string, callback: Callback): void { + export function onceWithEventIdTypeStringCallback(eventId: string, callback: Callback): void { if (eventId === '' || callback == null) { return; } OnOrOnceStringSync(eventId, true, callback, "eventData"); } - export function off(eventId: long): void { + export function onceWithEventIdTypeStringCallbackTypeGenericEventData(eventId: string, callback: Callback>): void { + if (eventId === '' || callback == null) { + return; + } + OnOrOnceGenericEventSync(eventId, true, callback, "genericEventData"); + } + + export function offWithEventIdTypeLong(eventId: long): void { OffNumberSync(eventId); } - export function off(eventId: string): void { + export function offWithEventIdTypeString(eventId: string): void { if (eventId === '') { return; } OffStringIdSync(eventId); } - export function off(eventId: long, callback: Callback): void { + export function offWithEventIdTypeLongCallback(eventId: long, callback: Callback): void { OffNumberCallbackSync(eventId, callback); } - export function off(eventId: string, callback: Callback | Callback>): void { + export function offWithEventIdTypeStringCallback(eventId: string, callback: Callback): void { if (eventId === '') { return; } - if (callback instanceof Callback) { - OffStringSync(eventId, callback as Callback); - } else { - OffGenericEventSync(eventId, callback as Callback>); + OffStringSync(eventId, callback); + } + + export function offWithEventIdTypeStringCallbackTypeGenericEventData(eventId: string, callback: Callback>): void { + if (eventId === '') { + return; } + OffGenericEventSync(eventId, callback); } - export function emit(event: InnerEvent, data?: EventData): void { + export function emitWithEventTypeInnerEventDataTypeEventData(event: InnerEvent, data?: EventData): void { if (data != undefined) { EmitInnerEventDataSync(event, data); } else { @@ -148,7 +161,7 @@ namespace emitter { } } - export function emit(eventId: string, data?: EventData): void { + export function emitWithEventIdTypeStringDataTypeEventData(eventId: string, data?: EventData): void { if (eventId === '') { return; } @@ -159,7 +172,7 @@ namespace emitter { } } - export function emit(eventId: string, data?: GenericEventData): void { + export function emitWithEventIdTypeStringDataTypeGenericEventData(eventId: string, data?: GenericEventData): void { if (eventId === '') { return; } @@ -170,7 +183,7 @@ namespace emitter { } } - export function emit(eventId: string, options: Options, data?: EventData): void { + export function emitWithEventIdTypeStringOptionsDataTypeEventData(eventId: string, options: Options, data?: EventData): void { if (eventId === '' || options == null) { return; } @@ -181,7 +194,7 @@ namespace emitter { } } - export function emit(eventId: string, options: Options, data?: GenericEventData): void { + export function emitWithEventIdTypeStringOptionsDataTypeGenericEventData(eventId: string, options: Options, data?: GenericEventData): void { if (eventId === '' || options == null) { return; } @@ -192,17 +205,25 @@ namespace emitter { } } - export function getListenerCount(eventId: long | string): long { + export function getListenerCountWithEventIdTypeLong(eventId: long): long { let count : long = 0; - if (typeof eventId === "number") { - count = getListenerCountSync(eventId as long); - } else { - if (eventId === '') { - return count; - } - count = getListenerCountStringSync(eventId as string); + count = getListenerCountSync(eventId); + return count; + } + + export function getListenerCountWithEventIdTypeString(eventId: string): long { + let count : long = 0; + if (eventId === '') { + return count; } + count = getListenerCountStringSync(eventId); return count; } + + overload on { onWithEventTypeInnerEventCallback, onWithEventIdTypeStringCallback, onWithEventIdTypeStringCallbackTypeGenericEventData }; + overload once { onceWithEventTypeInnerEventCallback, onceWithEventIdTypeStringCallback, onceWithEventIdTypeStringCallbackTypeGenericEventData }; + overload off { offWithEventIdTypeLong, offWithEventIdTypeString, offWithEventIdTypeLongCallback, offWithEventIdTypeStringCallback, offWithEventIdTypeStringCallbackTypeGenericEventData }; + overload emit { emitWithEventTypeInnerEventDataTypeEventData, emitWithEventIdTypeStringDataTypeEventData, emitWithEventIdTypeStringDataTypeGenericEventData, emitWithEventIdTypeStringOptionsDataTypeEventData, emitWithEventIdTypeStringOptionsDataTypeGenericEventData }; + overload getListenerCount { getListenerCountWithEventIdTypeLong, getListenerCountWithEventIdTypeString }; } export default emitter; \ No newline at end of file