diff --git a/api/@ohos.app.ability.AbilityLifecycleCallback.d.ts b/api/@ohos.app.ability.AbilityLifecycleCallback.d.ts index d7351fe2290935f0f2316d9c916208baf0251ecb..efb952ea53974dcd151acb146229c9a5483a3e6c 100644 --- a/api/@ohos.app.ability.AbilityLifecycleCallback.d.ts +++ b/api/@ohos.app.ability.AbilityLifecycleCallback.d.ts @@ -22,6 +22,7 @@ import UIAbility from './@ohos.app.ability.UIAbility'; import dataAbility from './@ohos.data.dataAbility'; import window from './@ohos.window'; +/*** if arkts 1.1 */ /** * The ability lifecycle callback. * @@ -47,6 +48,21 @@ import window from './@ohos.window'; * @since 11 */ export default class AbilityLifecycleCallback { +/*** endif */ + +/*** if arkts 1.2 */ +/** + * The ability lifecycle callback. + * + * @syscap SystemCapability.Ability.AbilityRuntime.AbilityCore + * @StageModelOnly + * @crossplatform + * @atomicservice + * @since 20 + * @arkts 1.2 + */ +declare interface AbilityLifecycleCallback { +/*** endif */ /** * Called back when an ability is started for initialization. * @@ -72,7 +88,8 @@ export default class AbilityLifecycleCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onAbilityCreate(ability: UIAbility): void; @@ -115,7 +132,8 @@ export default class AbilityLifecycleCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onWindowStageCreate(ability: UIAbility, windowStage: window.WindowStage): void; @@ -223,7 +241,8 @@ export default class AbilityLifecycleCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onWindowStageDestroy(ability: UIAbility, windowStage: window.WindowStage): void; @@ -264,7 +283,8 @@ export default class AbilityLifecycleCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onAbilityDestroy(ability: UIAbility): void; @@ -304,7 +324,8 @@ export default class AbilityLifecycleCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onAbilityForeground(ability: UIAbility): void; @@ -344,7 +365,8 @@ export default class AbilityLifecycleCallback { * @StageModelOnly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ onAbilityBackground(ability: UIAbility): void; @@ -435,3 +457,7 @@ export default class AbilityLifecycleCallback { */ onAbilitySaveState?(ability: UIAbility): void; } + +/*** if arkts 1.2 */ +export default AbilityLifecycleCallback; +/*** endif */ \ No newline at end of file diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts index cd4f9a46f16832fec7649af3a2b9c6d5aa2dc2f9..f60677120b4c57f35583a688f898d0883a7a0723 100644 --- a/api/application/ApplicationContext.d.ts +++ b/api/application/ApplicationContext.d.ts @@ -25,9 +25,7 @@ import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConsta import Want from '../@ohos.app.ability.Want'; import EnvironmentCallback from '../@ohos.app.ability.EnvironmentCallback'; import type ApplicationStateChangeCallback from '../@ohos.app.ability.ApplicationStateChangeCallback'; -/*** if arkts 1.1 */ import AbilityLifecycleCallback from '../@ohos.app.ability.AbilityLifecycleCallback'; -/*** endif */ /** * The context of an application. It allows access to application-specific resources. @@ -92,16 +90,17 @@ declare class ApplicationContext extends Context { * * @param { 'abilityLifecycle' } type - Event type. * @param { AbilityLifecycleCallback } callback - Callback used to return the ID of the registered listener. - * @returns { number } Returns the number code of the callback. + * @returns { int } Returns the number code of the callback. * @throws { BusinessError } 401 - Parameter error. Possible causes: 1.Mandatory parameters are left unspecified. * 2.Incorrect parameter types. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ - on(type: 'abilityLifecycle', callback: AbilityLifecycleCallback): number; + on(type: 'abilityLifecycle', callback: AbilityLifecycleCallback): int; /** * Unregister ability lifecycle callback. @@ -135,7 +134,7 @@ declare class ApplicationContext extends Context { *
* * @param { 'abilityLifecycle' } type - Event type. - * @param { number } callbackId - ID of the listener to unregister. + * @param { int } callbackId - ID of the listener to unregister. * @param { AsyncCallback