diff --git a/interfaces/ets/ani/hisysevent/ets/@ohos.hiSysEvent.ets b/interfaces/ets/ani/hisysevent/ets/@ohos.hiSysEvent.ets index c4a8134d12aae2f75aa0abac57868bfb535aab61..df3e81dfc89856c7518ffb4970f940670147111b 100644 --- a/interfaces/ets/ani/hisysevent/ets/@ohos.hiSysEvent.ets +++ b/interfaces/ets/ani/hisysevent/ets/@ohos.hiSysEvent.ets @@ -30,15 +30,15 @@ class WatcherAni implements hiSysEvent.Watcher { class QuerierAni implements hiSysEvent.Querier { onQuery: (infos: hiSysEvent.SysEventInfo[]) => void = (infos: hiSysEvent.SysEventInfo[]) => {}; - onComplete: (reason: number, total: number) => void = (reason: number, total: number) => {}; + onComplete: (reason: int, total: int) => void = (reason: int, total: int) => {}; } class QueryArgAni implements hiSysEvent.QueryArg { - beginTime: number = 0; - endTime: number = 0; - maxEvents: number = 0; - fromSeq?: number | undefined; - toSeq?: number | undefined; + beginTime: long = 0; + endTime: long = 0; + maxEvents: long = 0; + fromSeq?: long | undefined; + toSeq?: long | undefined; } class QueryRuleAni implements hiSysEvent.QueryRule { @@ -48,12 +48,12 @@ class QueryRuleAni implements hiSysEvent.QueryRule { } interface Result { - code: number; + code: int; message: string; } class ResultInner implements Result { - code: number = 0; + code: int = 0; message: string = ""; } @@ -99,24 +99,24 @@ export default namespace hiSysEvent { } export interface QueryArg { - beginTime: number; - endTime: number; - maxEvents: number; - fromSeq?: number; - toSeq?: number; + beginTime: long; + endTime: long; + maxEvents: long; + fromSeq?: long; + toSeq?: long; } export interface Querier { onQuery: (infos: SysEventInfo[]) => void; - onComplete: (reason: number, total: number) => void; + onComplete: (reason: int, total: int) => void; } native function writeSync(info: SysEventInfo): Result; export native function addWatcher(watcher: Watcher): void; export native function removeWatcher(watcher: Watcher): void; export native function query(queryArg: QueryArg, rules: QueryRule[], querier: Querier): void; - export native function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): number; - export native function subscribe(rules: QueryRule[]): number; + export native function exportSysEvents(queryArg: QueryArg, rules: QueryRule[]): long; + export native function subscribe(rules: QueryRule[]): long; export native function unsubscribe(): void; export function write(info: SysEventInfo, callback: AsyncCallback): void { diff --git a/interfaces/ets/ani/hisysevent/src/hisysevent_ani.cpp b/interfaces/ets/ani/hisysevent/src/hisysevent_ani.cpp index e1bc2fe841947b3e9f9a5f6b9c2682d78a541142..3aa96376c1e008c5131efb5c03a5c6b22d577531 100644 --- a/interfaces/ets/ani/hisysevent/src/hisysevent_ani.cpp +++ b/interfaces/ets/ani/hisysevent/src/hisysevent_ani.cpp @@ -362,18 +362,18 @@ static int32_t ParseQueryRules(ani_env *env, ani_array rulesAni, std::vectorObject_GetPropertyByName_Double(queryArgAni, "beginTime", &beginTimeRef)) { + ani_long beginTimeRef {}; + if (ANI_OK != env->Object_GetPropertyByName_Long(queryArgAni, "beginTime", &beginTimeRef)) { HILOG_ERROR(LOG_CORE, "get property beginTime failed,"); } queryArg.beginTime = static_cast(beginTimeRef); - ani_double endTimeRef {}; - if (ANI_OK != env->Object_GetPropertyByName_Double(queryArgAni, "endTime", &endTimeRef)) { + ani_long endTimeRef {}; + if (ANI_OK != env->Object_GetPropertyByName_Long(queryArgAni, "endTime", &endTimeRef)) { HILOG_ERROR(LOG_CORE, "get property endTime failed"); } queryArg.endTime = static_cast(endTimeRef); - ani_double maxEventsRef {}; - if (ANI_OK != env->Object_GetPropertyByName_Double(queryArgAni, "maxEvents", &maxEventsRef)) { + ani_long maxEventsRef {}; + if (ANI_OK != env->Object_GetPropertyByName_Long(queryArgAni, "maxEvents", &maxEventsRef)) { HILOG_ERROR(LOG_CORE, "get property maxEvents failed"); } queryArg.maxEvents = static_cast(maxEventsRef);