From 6877a905954c25486136816ac632fcadbf0bb2f2 Mon Sep 17 00:00:00 2001 From: zhangweihua Date: Tue, 24 Jun 2025 17:19:32 +0800 Subject: [PATCH] ANI display screen interface ready Signed-off-by: zhangweihua --- api/@ohos.display.d.ts | 21 ++++++--- api/@ohos.screen.d.ts | 90 ++++++++++++++++++++++++++------------- api/@ohos.screenshot.d.ts | 57 ++++++++++++++++--------- 3 files changed, 112 insertions(+), 56 deletions(-) diff --git a/api/@ohos.display.d.ts b/api/@ohos.display.d.ts index c218c6badd..fc0ba258ba 100644 --- a/api/@ohos.display.d.ts +++ b/api/@ohos.display.d.ts @@ -185,7 +185,8 @@ declare namespace display { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllDisplays(): Promise>; @@ -2060,7 +2061,8 @@ declare namespace display { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getCutoutInfo(): Promise; @@ -2074,7 +2076,8 @@ declare namespace display { * @throws { BusinessError } 1400003 - This display manager service works abnormally. * @syscap SystemCapability.Window.SessionManager * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ hasImmersiveWindow(callback: AsyncCallback): void; @@ -2088,7 +2091,8 @@ declare namespace display { * @throws { BusinessError } 1400003 - This display manager service works abnormally. * @syscap SystemCapability.Window.SessionManager * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ hasImmersiveWindow(): Promise; @@ -2100,7 +2104,8 @@ declare namespace display { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ getAvailableArea(): Promise; @@ -2115,7 +2120,8 @@ declare namespace display { * @throws { BusinessError } 1400003 - This display manager service works abnormally. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ on(type: 'availableAreaChange', callback: Callback): void; @@ -2130,7 +2136,8 @@ declare namespace display { * @throws { BusinessError } 1400003 - This display manager service works abnormally. * @syscap SystemCapability.Window.SessionManager * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ off(type: 'availableAreaChange', callback?: Callback): void; diff --git a/api/@ohos.screen.d.ts b/api/@ohos.screen.d.ts index ef84b921ab..1f1bf9d9ff 100644 --- a/api/@ohos.screen.d.ts +++ b/api/@ohos.screen.d.ts @@ -39,7 +39,8 @@ declare namespace screen { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllScreens(callback: AsyncCallback>): void; @@ -51,7 +52,8 @@ declare namespace screen { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function getAllScreens(): Promise>; @@ -165,7 +167,8 @@ declare namespace screen { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function makeMirror(mainScreen: number, mirrorScreen: Array, callback: AsyncCallback): void; @@ -181,7 +184,8 @@ declare namespace screen { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ function makeMirror(mainScreen: number, mirrorScreen: Array): Promise; @@ -631,7 +635,8 @@ declare namespace screen { * @enum { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ enum ScreenSourceMode { /** @@ -639,7 +644,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_MAIN = 0, @@ -648,7 +654,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_MIRROR = 1, @@ -657,7 +664,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_EXTEND = 2, @@ -666,7 +674,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ SCREEN_ALONE = 3 } @@ -677,7 +686,8 @@ declare namespace screen { * @interface Screen * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Screen { /** @@ -687,7 +697,8 @@ declare namespace screen { * @readonly * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly id: number; @@ -698,7 +709,8 @@ declare namespace screen { * @readonly * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly parent: number; @@ -709,7 +721,8 @@ declare namespace screen { * @readonly * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly supportedModeInfo: Array; @@ -720,7 +733,8 @@ declare namespace screen { * @readonly * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly activeModeIndex: number; @@ -731,7 +745,8 @@ declare namespace screen { * @readonly * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly orientation: Orientation; @@ -742,7 +757,8 @@ declare namespace screen { * @readonly * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 10 + * @since arkts {'1.1':'10', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly sourceMode: ScreenSourceMode; @@ -753,7 +769,8 @@ declare namespace screen { * @readonly * @syscap SystemCapability.WindowManager.WindowManager * @systemapi Hide this for inner system use. - * @since 15 + * @since arkts {'1.1':'15', '1.2':'20'} + * @arkts 1.1&1.2 */ readonly serialNumber?: string; @@ -828,7 +845,8 @@ declare namespace screen { * @throws { BusinessError } 1400003 - This display manager service works abnormally. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setDensityDpi(densityDpi: number, callback: AsyncCallback): void; @@ -843,7 +861,8 @@ declare namespace screen { * @throws { BusinessError } 1400003 - This display manager service works abnormally. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ setDensityDpi(densityDpi: number): Promise; } @@ -854,7 +873,8 @@ declare namespace screen { * @enum { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ enum Orientation { /** @@ -862,7 +882,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ UNSPECIFIED = 0, @@ -871,7 +892,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ VERTICAL = 1, @@ -880,7 +902,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ HORIZONTAL = 2, @@ -889,7 +912,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ REVERSE_VERTICAL = 3, @@ -898,7 +922,8 @@ declare namespace screen { * * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ REVERSE_HORIZONTAL = 4 } @@ -909,7 +934,8 @@ declare namespace screen { * @interface ScreenModeInfo * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ScreenModeInfo { /** @@ -918,7 +944,8 @@ declare namespace screen { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ id: number; @@ -928,7 +955,8 @@ declare namespace screen { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ width: number; @@ -938,7 +966,8 @@ declare namespace screen { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ height: number; @@ -948,7 +977,8 @@ declare namespace screen { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 9 + * @since arkts {'1.1':'9', '1.2':'20'} + * @arkts 1.1&1.2 */ refreshRate: number; } diff --git a/api/@ohos.screenshot.d.ts b/api/@ohos.screenshot.d.ts index 6a4afb6997..f7977fba44 100644 --- a/api/@ohos.screenshot.d.ts +++ b/api/@ohos.screenshot.d.ts @@ -27,7 +27,8 @@ import image from './@ohos.multimedia.image'; * @namespace screenshot * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ declare namespace screenshot { /** @@ -56,7 +57,8 @@ declare namespace screenshot { * @throws { BusinessError } 1400001 - Invalid display or screen. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 11 + * @since arkts {'1.1':'11', '1.2':'20'} + * @arkts 1.1&1.2 */ function save(options: ScreenshotOptions, callback: AsyncCallback): void; @@ -69,7 +71,8 @@ declare namespace screenshot { * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ function save(callback: AsyncCallback): void; @@ -85,7 +88,8 @@ declare namespace screenshot { *
2.Incorrect parameter types. * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ function save(options?: ScreenshotOptions): Promise; @@ -124,7 +128,8 @@ declare namespace screenshot { * @interface PickInfo * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface PickInfo { /** @@ -154,7 +159,8 @@ declare namespace screenshot { * @interface Rect * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Rect { /** @@ -163,7 +169,8 @@ declare namespace screenshot { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ left: number; @@ -173,7 +180,8 @@ declare namespace screenshot { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ top: number; @@ -183,7 +191,8 @@ declare namespace screenshot { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ width: number; @@ -193,7 +202,8 @@ declare namespace screenshot { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @atomicservice - * @since 12 + * @since arkts {'1.1':'12', '1.2':'20'} + * @arkts 1.1&1.2 */ height: number; } @@ -204,7 +214,8 @@ declare namespace screenshot { * @interface Size * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface Size { /** @@ -213,7 +224,8 @@ declare namespace screenshot { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ width: number; @@ -223,7 +235,8 @@ declare namespace screenshot { * @type { number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ height: number; } @@ -254,7 +267,8 @@ declare namespace screenshot { * @interface ScreenshotOptions * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ interface ScreenshotOptions { /** @@ -263,7 +277,8 @@ declare namespace screenshot { * @type { ?Rect } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ screenRect?: Rect; /** @@ -272,7 +287,8 @@ declare namespace screenshot { * @type { ?Size } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ imageSize?: Size; /** @@ -281,7 +297,8 @@ declare namespace screenshot { * @type { ?number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 7 + * @since arkts {'1.1':'7', '1.2':'20'} + * @arkts 1.1&1.2 */ rotation?: number; /** @@ -290,7 +307,8 @@ declare namespace screenshot { * @type { ?number } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 8 + * @since arkts {'1.1':'8', '1.2':'20'} + * @arkts 1.1&1.2 */ displayId?: number; /** @@ -299,7 +317,8 @@ declare namespace screenshot { * @type { ?boolean } * @syscap SystemCapability.WindowManager.WindowManager.Core * @systemapi Hide this for inner system use. - * @since 14 + * @since arkts {'1.1':'14', '1.2':'20'} + * @arkts 1.1&1.2 */ isNotificationNeeded?: boolean; /** -- Gitee