From cf0dc768c8b6aad8e4e7a2224b6aff3537c86999 Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Sat, 7 Jun 2025 14:02:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=83=E8=83=BD=E5=8A=9B=E5=BC=80=E6=94=BECo?= =?UTF-8?q?ntext=E3=80=81want=E3=80=81StartOptions=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=88=B01.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzezhong --- api/@ohos.app.ability.StartOptions.d.ts | 8 +++-- api/@ohos.app.ability.Want.d.ts | 30 +++++++++++------ api/@ohos.app.ability.contextConstant.d.ts | 39 ++++++++++++++-------- api/application/ApplicationContext.d.ts | 15 ++++++--- api/application/BaseContext.d.ts | 6 ++-- api/application/Context.d.ts | 33 ++++++++++++------ 6 files changed, 89 insertions(+), 42 deletions(-) diff --git a/api/@ohos.app.ability.StartOptions.d.ts b/api/@ohos.app.ability.StartOptions.d.ts index 97562e6510..b51de5d112 100644 --- a/api/@ohos.app.ability.StartOptions.d.ts +++ b/api/@ohos.app.ability.StartOptions.d.ts @@ -18,10 +18,12 @@ * @kit AbilityKit */ +/*** if arkts 1.1 */ import contextConstant from "./@ohos.app.ability.contextConstant"; import image from "./@ohos.multimedia.image"; import bundleManager from './@ohos.bundle.bundleManager'; import CompletionHandler from "./@ohos.app.ability.CompletionHandler"; +/*** endif */ /** * StartOptions is the basic communication component of the system. @@ -36,7 +38,8 @@ import CompletionHandler from "./@ohos.app.ability.CompletionHandler"; * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class StartOptions { /** @@ -67,7 +70,8 @@ export default class StartOptions { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ displayId?: number; diff --git a/api/@ohos.app.ability.Want.d.ts b/api/@ohos.app.ability.Want.d.ts index e5051e6272..c02d8ccd5b 100644 --- a/api/@ohos.app.ability.Want.d.ts +++ b/api/@ohos.app.ability.Want.d.ts @@ -42,7 +42,8 @@ * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export default class Want { /** @@ -66,7 +67,8 @@ export default class Want { * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ bundleName?: string; @@ -96,7 +98,8 @@ export default class Want { * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ abilityName?: string; @@ -117,7 +120,8 @@ export default class Want { * @type { ?string } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ deviceId?: string; @@ -137,7 +141,8 @@ export default class Want { * @type { ?string } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ uri?: string; @@ -168,7 +173,8 @@ export default class Want { * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 18 + * @since arkts {'1.1':'18', '1.2':'20'} + * @arkts 1.1&1.2 */ type?: string; @@ -206,7 +212,8 @@ export default class Want { * @type { ?string } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ action?: string; @@ -291,7 +298,8 @@ export default class Want { * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ parameters?: Record; @@ -309,7 +317,8 @@ export default class Want { * @type { ?Array } * @syscap SystemCapability.Ability.AbilityBase * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ entities?: Array; @@ -339,7 +348,8 @@ export default class Want { * @syscap SystemCapability.Ability.AbilityBase * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ moduleName?: string; diff --git a/api/@ohos.app.ability.contextConstant.d.ts b/api/@ohos.app.ability.contextConstant.d.ts index 27b8e2e769..723eb46972 100644 --- a/api/@ohos.app.ability.contextConstant.d.ts +++ b/api/@ohos.app.ability.contextConstant.d.ts @@ -33,7 +33,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace contextConstant { /** @@ -51,7 +52,8 @@ declare namespace contextConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum AreaMode { /** @@ -67,7 +69,8 @@ declare namespace contextConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ EL1 = 0, @@ -84,7 +87,8 @@ declare namespace contextConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @StageModelOnly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ EL2 = 1, @@ -95,7 +99,8 @@ declare namespace contextConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ EL3 = 2, @@ -107,7 +112,8 @@ declare namespace contextConstant { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ EL4 = 3, @@ -130,7 +136,8 @@ declare namespace contextConstant { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum ProcessMode { /** @@ -139,7 +146,8 @@ declare namespace contextConstant { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NEW_PROCESS_ATTACH_TO_PARENT = 1, @@ -150,7 +158,8 @@ declare namespace contextConstant { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ NEW_PROCESS_ATTACH_TO_STATUS_BAR_ITEM = 2, @@ -161,7 +170,8 @@ declare namespace contextConstant { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ ATTACH_TO_STATUS_BAR_ITEM = 3 } @@ -172,7 +182,8 @@ declare namespace contextConstant { * @enum { number } * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ export enum StartupVisibility { /** @@ -180,7 +191,8 @@ declare namespace contextConstant { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ STARTUP_HIDE = 0, @@ -189,7 +201,8 @@ declare namespace contextConstant { * * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ STARTUP_SHOW = 1 } diff --git a/api/application/ApplicationContext.d.ts b/api/application/ApplicationContext.d.ts index e43a2c4eb4..b90f46c56a 100644 --- a/api/application/ApplicationContext.d.ts +++ b/api/application/ApplicationContext.d.ts @@ -18,14 +18,17 @@ * @kit AbilityKit */ -import { AsyncCallback } from '../@ohos.base'; import Context from './Context'; + +/*** if arkts 1.1 */ +import { AsyncCallback } from '../@ohos.base'; import AbilityLifecycleCallback from '../@ohos.app.ability.AbilityLifecycleCallback'; import EnvironmentCallback from '../@ohos.app.ability.EnvironmentCallback'; import type ApplicationStateChangeCallback from '../@ohos.app.ability.ApplicationStateChangeCallback'; import { ProcessInformation } from './ProcessInformation'; import type ConfigurationConstant from '../@ohos.app.ability.ConfigurationConstant'; import Want from '../@ohos.app.ability.Want'; +/*** endif */ /** * The context of an application. It allows access to application-specific resources. @@ -53,9 +56,10 @@ import Want from '../@ohos.app.ability.Want'; * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class ApplicationContext extends Context { +declare class ApplicationContext extends Context { /** * Register ability lifecycle callback. * @@ -705,7 +709,8 @@ export default class ApplicationContext extends Context { * @throws { BusinessError } 16000050 - Internal error. * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ setSupportedProcessCache(isSupported : boolean): void; @@ -795,3 +800,5 @@ export default class ApplicationContext extends Context { */ getAllRunningInstanceKeys(): Promise>; } + +export default ApplicationContext; \ No newline at end of file diff --git a/api/application/BaseContext.d.ts b/api/application/BaseContext.d.ts index feb94cc4b0..77327e6508 100644 --- a/api/application/BaseContext.d.ts +++ b/api/application/BaseContext.d.ts @@ -40,7 +40,8 @@ * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ export default abstract class BaseContext { /** @@ -65,7 +66,8 @@ export default abstract class BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ stageMode: boolean; } diff --git a/api/application/Context.d.ts b/api/application/Context.d.ts index b6a716927e..ae0f9368ea 100644 --- a/api/application/Context.d.ts +++ b/api/application/Context.d.ts @@ -18,12 +18,14 @@ * @kit AbilityKit */ -import { ApplicationInfo } from '../bundleManager/ApplicationInfo'; +/*** if arkts 1.1 */ import type { AsyncCallback } from '../@ohos.base'; -import resmgr from '../@ohos.resourceManager'; -import BaseContext from './BaseContext'; import EventHub from './EventHub'; +/*** endif */ +import { ApplicationInfo } from '../bundleManager/ApplicationInfo'; import ApplicationContext from './ApplicationContext'; +import BaseContext from './BaseContext'; +import resmgr from '../@ohos.resourceManager'; import contextConstant from '../@ohos.app.ability.contextConstant'; /** @@ -54,9 +56,10 @@ import contextConstant from '../@ohos.app.ability.contextConstant'; * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ -export default class Context extends BaseContext { +declare class Context extends BaseContext { /** * Indicates the capability of accessing application resources. * @@ -82,7 +85,8 @@ export default class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ resourceManager: resmgr.ResourceManager; @@ -111,7 +115,8 @@ export default class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ applicationInfo: ApplicationInfo; @@ -169,7 +174,8 @@ export default class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ tempDir: string; @@ -198,7 +204,8 @@ export default class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ filesDir: string; @@ -384,7 +391,8 @@ export default class Context extends BaseContext { * @syscap SystemCapability.Ability.AbilityRuntime.Core * @stagemodelonly * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ area: contextConstant.AreaMode; @@ -531,7 +539,8 @@ export default class Context extends BaseContext { * @stagemodelonly * @crossplatform * @atomicservice - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ getApplicationContext(): ApplicationContext; @@ -639,3 +648,5 @@ export default class Context extends BaseContext { */ createDisplayContext(displayId: number): Context; } + +export default Context; \ No newline at end of file -- Gitee